summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--VERSION2
m---------lib/ansible/modules/core13
m---------lib/ansible/modules/extras13
4 files changed, 17 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5221839ff..7964d652cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
Ansible Changes By Release
==========================
-## 2.0 "TBD" - ACTIVE DEVELOPMENT
+## 2.0 "Over the Hills and Far Away" - ACTIVE DEVELOPMENT
Major Changes:
* Introducing the new block/rescue/always directives, allow for making task blocks and introducing exception like semantics
diff --git a/VERSION b/VERSION
index a4b5d82d9e..33f1c81ca9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0 0.0.pre
+2.0.0 0.1.alpha1
diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core
-Subproject 85ddb1b90232dbd68798e9b2d7dafa5689a1d30
+Subproject 66288d48a2ec95735e86d457ef4ee5f1eb0ff0f
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
-Subproject 7a0bfd91bbfd12dcfd0cd5263f193ede30804fe
+Subproject 8d8f1c510d46f330541cb672cb8214d99f37531