Merge pull request #157 from hasbro17/haseeb/post-release-version-bump

hasbro17 · web-flow · commit 2cb9dfb358f7 · 2018-04-02T14:28:33.000-07:00
*: 0.0.2+git version bump, dep constraint set to master branch
diff --git a/pkg/generator/gopkg_tmpls.go b/pkg/generator/gopkg_tmpls.go
@@ -164,6 +164,6 @@ const gopkgTomlTmpl = `[[override]]
 [[constraint]]
   name = "github.com/coreos/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master"
-  version = "=v0.0.2"
+  branch = "master"
+  # version = "=v0.0.2"
 `
diff --git a/version/version.go b/version/version.go
@@ -15,5 +15,5 @@
 package version
 
 var (
-	Version = "0.0.2"
+	Version = "0.0.2+git"
 )

Original file line number	Diff line number	Diff line change
@@ -164,6 +164,6 @@ const gopkgTomlTmpl = `[[override]]
`164`	`164`	`[[constraint]]`
`165`	`165`	`name = "github.com/coreos/operator-sdk"`
`166`	`166`	`# The version rule is used for a specific release and the master branch for in between releases.`
`167`		`- # branch = "master"`
`168`		`- version = "=v0.0.2"`
	`167`	`+ branch = "master"`
	`168`	`+ # version = "=v0.0.2"`
`169`	`169`	`