summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-05-05 16:46:31 -0500
committerJames Cammarata <jimi@sngx.net>2014-05-05 16:46:31 -0500
commitf05d4575607613b147b6ec15155b06775f1fee7c (patch)
treeb48b87dab9502025be022e68769a4012368beb3a
parentab5500072b2ec802aa8087fafc66d837de0238f9 (diff)
downloadansible-release1.6.0.tar.gz
Updating changlog and releases for 1.6release1.6.0
-rw-r--r--CHANGELOG.md2
-rw-r--r--RELEASES.txt13
2 files changed, 3 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acad8c09c3..353a85d0ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
Ansible Changes By Release
==========================
-## 1.6 "And the Cradle Will Rock" - Active Development
+## 1.6 "And the Cradle Will Rock"
Major features/changes:
diff --git a/RELEASES.txt b/RELEASES.txt
index b2d2071ab7..e030c24323 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -1,21 +1,12 @@
Ansible Releases at a Glance
============================
-Future
-++++++
-
-1.7 "Summer Nights" -------- SUMMER 2014
-
Active Development
++++++++++++++++++
-1.6 "The Cradle Will Rock" - CURRENT DEVEL BRANCH
-
-Previous
-++++++++
+1.7 "Summer Nights" -------- CURRENT DEVEL BRANCH
-=======
-1.6 "The Cradle Will Rock" - NEXT
+1.6 "The Cradle Will Rock" - 05-05-2014
1.5.5 "Love Walks In" -------- 04-18-2014
1.5.4 "Love Walks In" -------- 04-01-2014
1.5.3 "Love Walks In" -------- 03-13-2014