From: Alfredo Deza <alfredo@deza.pe>
Date: Mon, 12 Aug 2013 15:39:40 +0000 (-0400)
Subject: update the changelog with this branch changes
X-Git-Tag: v1.2.1~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39%2Fhead;p=ceph-deploy.git

update the changelog with this branch changes

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
---

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a30d732..1a57a48 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,4 +1,11 @@
 
+1.2.1
+-----
+* Print the help when no arguments are passed
+* Add a ``--version`` flag
+* Show the version in the help menu
+* Catch ``DeployError`` exceptions nicely with the logger
+
 1.2
 ---
 * Better logging output