summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laska <jlaska@ansible.com>2015-06-12 15:00:53 +0200
committerJames Laska <jlaska@ansible.com>2015-06-12 15:00:53 +0200
commit2424ed4832eedc92a9ac8f7787131442b018fc40 (patch)
tree6e60fabe0724062162550f38d33917f24e4756d7
parentMerge pull request #278 from cchurch/openstack_inventory_updates (diff)
downloadawx-2424ed4832eedc92a9ac8f7787131442b018fc40.tar.xz
awx-2424ed4832eedc92a9ac8f7787131442b018fc40.zip
Update release process docs
-rw-r--r--README.md10
-rw-r--r--docs/release_process.md10
2 files changed, 13 insertions, 7 deletions
diff --git a/README.md b/README.md
index a3c1da74db..266c6cad2f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The current version under development is 2.1.0.
Development releases always use the 'master' branch.
-Release schedule
+Release History
================
* 1.2.2, July 31, 2013.
@@ -25,8 +25,12 @@ Release schedule
* 2.0.2, October 6, 2014
* 2.0.3, November 14, 2014
* 2.0.4, November 21, 2014
-* 2.0.5, ...
-* 2.1.0, January 7, 2014
+* 2.0.5, December 10, 2014
+* 2.1.0, January 7, 2015
+* 2.1.1, February 4, 2015
+* 2.1.2, March 25, 2015
+* 2.1.3, April 15, 2015
+* 2.1.4, June 12, 2015
Any fixes should be applied on the appropriate release branch and be cherry-picked to
master.
diff --git a/docs/release_process.md b/docs/release_process.md
index f5248fd8a1..de4a7354d1 100644
--- a/docs/release_process.md
+++ b/docs/release_process.md
@@ -15,18 +15,20 @@ successful release.
__version__ = 'X.Y.Z'
```
-2. Update the rpm package changelog by adding a new entry to the file `packaging/rpm/ansible-tower.spec`.
+2. Update the "Release History" in the file `README.md`.
-3. Update the debian package changelog by adding a new entry to the file `packaging/debian/changelog`.
+3. Update the rpm package changelog by adding a new entry to the file `packaging/rpm/ansible-tower.spec`.
-4. Tag and push the release to git.
+4. Update the debian package changelog by adding a new entry to the file `packaging/debian/changelog`.
+
+5. Tag and push the release to git.
```
git tag <X.Y.Z>
git push --tags
```
-5. Create and push a release branch to git.
+6. Create and push a release branch to git.
```
git branch release_<X.Y.Z>