Skip to content

Commit

Permalink
Update master for 1.5 development
Browse files Browse the repository at this point in the history
  • Loading branch information
danielnelson committed Aug 16, 2017
1 parent 8b588ea commit 3006ccb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## v1.5 [unreleased]

## v1.4 [unreleased]

### Release Notes
Expand Down
2 changes: 1 addition & 1 deletion cmd/telegraf/telegraf.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

2 comments on commit 3006ccb

@sureshsubramaniam
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The git describe still shows as below

git describe

1.2.0-rc1-411-g36c2c88

@danielnelson
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think I can fix this now unless I remove the tag. I guess it will say this forever :(

Please sign in to comment.