summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Grant <briangrant@google.com>2015-07-23 00:42:03 +0000
committerBrian Grant <briangrant@google.com>2015-07-23 00:42:03 +0000
commitbd03d6d49788d5dd62e686dcaa3f641b964cea58 (patch)
treed4fb267d01f47ed10b302b17f69aa92ebc6cce10
parent39c004737b4cd86da696231aa55c4d8eabb11994 (diff)
Change to semantic versioning.
-rw-r--r--versioning.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/versioning.md b/versioning.md
index 5d1cec0e..9009dc59 100644
--- a/versioning.md
+++ b/versioning.md
@@ -44,8 +44,8 @@ Legend:
* Kube 1.0.0, 1.0.1 -- DONE!
* Kube 1.0.X (X>1): Standard operating procedure. We patch the release-1.0 branch as needed and increment the patch number.
-* Kube 1.1alpha.X: Released roughly every two weeks by cutting from HEAD. No cherrypick releases. If there is a critical bugfix, a new release from HEAD can be created ahead of schedule. (This applies to the beta releases as well.)
-* Kube 1.1beta.X: When HEAD is feature-complete, we go into code freeze 2 weeks prior to the desired 1.1.0 date and only merge PRs essential to 1.1. Releases continue to be cut from HEAD until we're essentially done.
+* Kube 1.1.0-alpha.X: Released roughly every two weeks by cutting from HEAD. No cherrypick releases. If there is a critical bugfix, a new release from HEAD can be created ahead of schedule. (This applies to the beta releases as well.)
+* Kube 1.1.0-beta.X: When HEAD is feature-complete, we go into code freeze 2 weeks prior to the desired 1.1.0 date and only merge PRs essential to 1.1. Releases continue to be cut from HEAD until we're essentially done.
* Kube 1.1.0: Final release. Should occur between 3 and 4 months after 1.0.
### Major version timeline