Update master for 1.5 development

This commit is contained in:
Daniel Nelson 2017-08-16 16:54:15 -07:00
parent 8b588ea37f
commit 3006ccbf2f
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
2 changed files with 3 additions and 1 deletions

View File

@ -1,3 +1,5 @@
## v1.5 [unreleased]
## v1.4 [unreleased] ## v1.4 [unreleased]
### Release Notes ### Release Notes

View File

@ -59,7 +59,7 @@ var fService = flag.String("service", "",
// ie, -ldflags "-X main.version=`git describe --always --tags`" // ie, -ldflags "-X main.version=`git describe --always --tags`"
var ( var (
nextVersion = "1.4.0" nextVersion = "1.5.0"
version string version string
commit string commit string
branch string branch string