Release date / version bump for v0.5.0 release.

shawnrusaw-wf · Mar 6, 2014 · 2000078 · 2000078
1 parent 86c8585
commit 2000078
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,4 @@
-0.5.0 (2014-??-??)
+0.5.0 (2014-03-06)
 ==================
 
 Backwards Incompatibilities

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.0-dev'
+release = '0.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/developing/release.rst b/docs/source/developing/release.rst
@@ -18,6 +18,10 @@ of the Heka server.
 #. If this release is the highest released version number to date, the
    verified commit should be merged into the master branch.
 
+#. If there have been any changes made on the release branch that should also
+   be applied to the dev branch, those changes should be merged into the dev
+   branch.
+
 #. Bump version number (in `cmd/hekad/main.go`, `docs/source/conf.py`, and
    `CMakeLists.txt`) and add section for future release to changelog
    (`CHANGES.txt`). Commit "version bump" revision to the released version