From a8b2f555329b5135c73e4f851fbc9101caab631d Mon Sep 17 00:00:00 2001 From: Alexander Pavel Date: Fri, 30 Nov 2018 12:18:40 -0800 Subject: [PATCH] Revert "pkg/scaffold,version,changelog: bump to v0.2.0 (#791)" This reverts commit a40a33ab6d224da2ddb143de518684d2d5bfe7fe. --- CHANGELOG.md | 2 +- pkg/scaffold/gopkgtoml.go | 4 ++-- pkg/scaffold/gopkgtoml_test.go | 4 ++-- version/version.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60920a265ef..bcf5d01c4ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v0.2.0 +## Unreleased ### Changed diff --git a/pkg/scaffold/gopkgtoml.go b/pkg/scaffold/gopkgtoml.go index d7a038eeb80..b3890846d9b 100644 --- a/pkg/scaffold/gopkgtoml.go +++ b/pkg/scaffold/gopkgtoml.go @@ -85,8 +85,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 = "v0.2.x" #osdk_branch_annotation - version = "=v0.2.0" #osdk_version_annotation + branch = "master" #osdk_branch_annotation + # version = "=v0.1.1" #osdk_version_annotation [prune] go-tests = true diff --git a/pkg/scaffold/gopkgtoml_test.go b/pkg/scaffold/gopkgtoml_test.go index 1d3355ff8ae..ec78d238d09 100644 --- a/pkg/scaffold/gopkgtoml_test.go +++ b/pkg/scaffold/gopkgtoml_test.go @@ -77,8 +77,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 = "v0.2.x" #osdk_branch_annotation - version = "=v0.2.0" #osdk_version_annotation + branch = "master" #osdk_branch_annotation + # version = "=v0.1.1" #osdk_version_annotation [prune] go-tests = true diff --git a/version/version.go b/version/version.go index 44fe2bd724f..7ad80a6404e 100644 --- a/version/version.go +++ b/version/version.go @@ -15,5 +15,5 @@ package version var ( - Version = "v0.2.0" + Version = "v0.1.1+git" )