Update master for 1.5 development

3006ccbf · Daniel Nelson · 8b588ea3 · 3006ccbf · 3006ccbf
Unverified Commit 3006ccbf authored 7 years ago by Daniel Nelson
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## v1.5 [unreleased]
+
 ## v1.4 [unreleased]

 ### Release Notes

--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -59,7 +59,7 @@ var fService = flag.String("service", "",
 //   ie, -ldflags "-X main.version=`git describe --always --tags`"

 var (
-	nextVersion = "1.4.0"
+	nextVersion = "1.5.0"
 	version     string
 	commit      string
 	branch      string