From 3006ccbf2f85b1eff51c37136037706206d1a517 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Wed, 16 Aug 2017 16:54:15 -0700 Subject: [PATCH] Update master for 1.5 development --- CHANGELOG.md | 2 ++ cmd/telegraf/telegraf.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 735b48e44424c..f6771077d1661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## v1.5 [unreleased] + ## v1.4 [unreleased] ### Release Notes diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go index f0ff6e66ad4ee..6301ea8ff287d 100644 --- 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