Bump version to v0.6.0+git (#1215)

theishshah · AlexNPavel · commit 4228df001526 · 2019-03-15T20:30:54.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Bug Fixes
+
 ## v0.6.0
 
 ### Added
diff --git a/pkg/scaffold/ansible/gopkgtoml.go b/pkg/scaffold/ansible/gopkgtoml.go
@@ -35,8 +35,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) {
 const gopkgTomlTmpl = `[[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.6.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.6.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"
diff --git a/pkg/scaffold/gopkgtoml.go b/pkg/scaffold/gopkgtoml.go
@@ -102,8 +102,8 @@ required = [
 [[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.6.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.6.0" #osdk_version_annotation
 
 [prune]
   go-tests = true
diff --git a/pkg/scaffold/gopkgtoml_test.go b/pkg/scaffold/gopkgtoml_test.go
@@ -94,8 +94,8 @@ required = [
 [[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.6.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.6.0" #osdk_version_annotation
 
 [prune]
   go-tests = true
diff --git a/pkg/scaffold/helm/gopkgtoml.go b/pkg/scaffold/helm/gopkgtoml.go
@@ -35,8 +35,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) {
 const gopkgTomlTmpl = `[[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.6.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.6.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"
diff --git a/version/version.go b/version/version.go
@@ -15,5 +15,5 @@
 package version
 
 var (
-	Version = "v0.6.0"
+	Version = "v0.6.0+git"
 )

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`package version`
`16`	`16`
`17`	`17`	`var (`
`18`		`- Version = "v0.6.0"`
	`18`	`+ Version = "v0.6.0+git"`
`19`	`19`	`)`