From 8c1862d8ae2377de64d0b95b49cd7a3722b4462c Mon Sep 17 00:00:00 2001
From: nathan haugo <nhaugo@gmail.com>
Date: Mon, 23 Jul 2018 15:53:48 -0700
Subject: [PATCH] Update master to 1.7.0 and use bumpversion for makefile
 config instead of git tags

---
 .bumpversion.cfg    | 4 ++--
 Makefile            | 2 +-
 README.md           | 4 ++--
 server/swagger.json | 2 +-
 ui/package.json     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a60bed100..643d8c2bc 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
-current_version = 1.6.0
-files = README.md server/swagger.json
+current_version = 1.7.0
+files = README.md server/swagger.json Makefile
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<release>\d+)
 serialize = {major}.{minor}.{release}
 
diff --git a/Makefile b/Makefile
index 37525c161..2414c2535 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: assets dep clean test gotest gotestrace jstest run run-dev run-hmr ctags
 
-VERSION ?= $(shell git describe --always --tags)
+VERSION = 1.7.0
 COMMIT ?= $(shell git rev-parse --short=8 HEAD)
 GOBINDATA := $(shell go list -f {{.Root}}  github.com/kevinburke/go-bindata 2> /dev/null)
 YARN := $(shell command -v yarn 2> /dev/null)
diff --git a/README.md b/README.md
index b4ba574f7..8c7a7a0ef 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ option.
 ## Versions
 
 The most recent version of Chronograf is
-[v1.6.0](https://www.influxdata.com/downloads/).
+[v1.7.0](https://www.influxdata.com/downloads/).
 
 Spotted a bug or have a feature request? Please open
 [an issue](https://github.com/influxdata/chronograf/issues/new)!
@@ -178,7 +178,7 @@ By default, chronograf runs on port `8888`.
 To get started right away with Docker, you can pull down our latest release:
 
 ```sh
-docker pull chronograf:1.6.0
+docker pull chronograf:1.7.0
 ```
 
 ### From Source
diff --git a/server/swagger.json b/server/swagger.json
index 1c4286049..c1436f3c7 100644
--- a/server/swagger.json
+++ b/server/swagger.json
@@ -3,7 +3,7 @@
   "info": {
     "title": "Chronograf",
     "description": "API endpoints for Chronograf",
-    "version": "1.6.0"
+    "version": "1.7.0"
   },
   "schemes": ["http"],
   "basePath": "/chronograf/v1",
diff --git a/ui/package.json b/ui/package.json
index 5f95254db..6caf24ecc 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronograf-ui",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "private": false,
   "license": "AGPL-3.0",
   "description": "",