dogonthehorizon

apiVersion: extensions/v1beta1
kind: Ingress
metadata:
    kubernetes.io/ingress.class: nginx
  labels:
    app: spin
    cluster: spin-ingress
  name: spin-ingress
  namespace: spinnaker
spec:

dogonthehorizon

apiVersion: pacrd.armory.spinnaker.io/v1alpha1
kind: Application
metadata:
  name: nginx-hello-world
spec:
  email: fernando.freire@armory.io
  description: Sample pipeline showing a blue/green deployment
---
apiVersion: pacrd.armory.spinnaker.io/v1alpha1
kind: Pipeline

dogonthehorizon

name: my-program

library
  hs-source-dirs: src

executable my-exec
  main-is: app/Main.hs
  ghc-options:
    -optl-static
    -optl-pthread

dogonthehorizon

From dea6ac860513e6cde71327b5cd4d4ae7710fc238 Mon Sep 17 00:00:00 2001
From: Fernando Freire <fernando.freire@nike.com>
Date: Wed, 12 Oct 2016 11:23:16 -0700
Subject: [PATCH 1/1] Remove tags value for @Monitor annotations

This has not been supported since v0.4.35:
https://github.com/Netflix/servo/commit/76f1c5d1f5e2dc756bac07e0af5056ead7b7d97d#diff-2497b7d38a093a912d12fa9d15301184
---
 Annotations.textile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

dogonthehorizon

#!/usr/bin/env bash

# Usage: ./app.py My super great idea desecription!!!

echo $* >> ideas.txt

dogonthehorizon

# SOURCE: http://stackoverflow.com/a/4969679

# in case branchA is not our current branch
git checkout branchA

# make merge commit but without conflicts!!
# the contents of 'ours' will be discarded later
git merge -s ours branchB    

# make temporary branch to merged commit