From 35a5feb4737e0354f56c56df216699026e1263e6 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Fri, 31 Aug 2018 14:53:08 +0100
Subject: [PATCH 1/2] Release notes for flux v1.6.0

A minor version bump, because it has new, backward-compatible
features.
---
 CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e3e0da05..a6d05223c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,50 @@
 This is the changelog for the Flux daemon; the changelog for the Helm
 operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md).
 
+## 1.6.0 (2018-08-31)
+
+This release improves existing features, and has some new goodies like
+regexp tag filtering and multiple sync paths. Have fun!
+
+We also have a [new contributing guide](./CONTRIBUTING.md).
+
+### Fixes
+
+- Update example manifests to Kubernetes 1.9+ API versions
+  [weaveworks/flux#1322](https://github.com/weaveworks/flux/pull/1322)
+- Operate with more restricted RBAC permissions
+  [weaveworks/flux#1298](https://github.com/weaveworks/flux/pull/1298)
+- Verify baked-in host keys (against known good fingerprints) during
+  build
+  [weaveworks/flux#1283](https://github.com/weaveworks/flux/pull/1283)
+- Support authentication for GKE, AWS, etc., when `fluxctl` does
+  automatic port forwarding
+  [weaveworks/flux#1284](https://github.com/weaveworks/flux/pull/1284)
+- Respect tag filters in `fluxctl release ...`, unless `--force` is
+  given
+  [weaveworks/flux#1270](https://github.com/weaveworks/flux/pull/1270)
+
+### Improvements
+
+- Cope with `':'` characters in resource names
+  [weaveworks/flux#1282](https://github.com/weaveworks/flux/pull/1282)
+- Accept multiple `--git-path` arguments; sync (and update) files in
+  all the paths given
+  [weaveworks/flux#1297](https://github.com/weaveworks/flux/pull/1297)
+- Use image pull secrets attached to service accounts, as well as
+  those attached to workloads themselves
+  [weaveworks/flux#1291](https://github.com/weaveworks/flux/pull/1291)
+- You can now filter images using regular expressions (in addition to
+  semantic version ranges, and glob patterns)
+  [weaveworks/flux#1292](https://github.com/weaveworks/flux/pull/1292)
+
+### Thanks
+
+Thank you to the following for contributions: @Alien2150,
+@ariefrahmansyah, @brandon-bethke-neudesic, @bzon, @dholbach,
+@dkerwin, @hartmut-pq, @hiddeco, @justinbarrick, @petervandenabeele,
+@nicolerenee, @rndstr, @squaremo, @stefanprodan, @stephenmoloney.
+
 ## 1.5.0 (2018-08-08)
 
 This release adds semver image filters, makes it easier to use

From 7a844781e71d98f74b025c65b4c8363f3a181cc9 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Fri, 31 Aug 2018 15:11:32 +0100
Subject: [PATCH 2/2] Build and upload Windows binary of fluxctl

---
 Makefile            | 3 +--
 bin/upload-binaries | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2a7f6c311..88d6ebf4a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ all: $(GOPATH)/bin/fluxctl $(GOPATH)/bin/fluxd $(GOPATH)/bin/helm-operator build
 
 release-bins:
 	for arch in amd64; do \
-		for os in linux darwin; do \
+		for os in linux darwin windows; do \
 			CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch go build -o "build/fluxctl_"$$os"_$$arch" $(LDFLAGS) -ldflags "-X main.version=$(shell ./docker/image-tag)" ./cmd/fluxctl/; \
 		done; \
 	done
@@ -67,7 +67,6 @@ build/kubectl: cache/kubectl-$(KUBECTL_VERSION) docker/kubectl.version
 cache/kubectl-$(KUBECTL_VERSION):
 	mkdir -p cache
 	curl -L -o $@ "https://storage.googleapis.com/kubernetes-release/release/$(KUBECTL_VERSION)/bin/linux/amd64/kubectl"
-
 $(GOPATH)/bin/fluxctl: $(FLUXCTL_DEPS)
 $(GOPATH)/bin/fluxctl: ./cmd/fluxctl/*.go
 	go install ./cmd/fluxctl
diff --git a/bin/upload-binaries b/bin/upload-binaries
index 844e1a622..69e21ab79 100755
--- a/bin/upload-binaries
+++ b/bin/upload-binaries
@@ -9,7 +9,7 @@ GITHUB_REPO=${GITHUB_REPO:-"${CIRCLE_PROJECT_REPONAME}"}
 GITHUB_TAG=${GITHUB_TAG:-"${CIRCLE_TAG}"}
 
 for arch in amd64; do
-	for os in linux darwin; do
+	for os in linux darwin windows; do
 		echo "= Uploading fluxctl_${os}_${arch} to GH release ${GITHUB_TAG}"
 		github-release upload \
 			--user ${GITHUB_USER} \