Merge pull request #243 from untergeek/2.1.1

Update version to 2.1.1

Changelog.rst

@@ -3,6 +3,12 @@
 Changelog
 =========
 
+2.1.1 (30 December 2014)
+
+**Bug fixes**
+
+ * Renamed unnecessarily redundant ``--replicas`` to ``--count`` in args for ``curator_script.py``
+
 2.1.0 (30 December 2014)
 -------------
 

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

curator/curator.py

@@ -6,7 +6,7 @@
 
 import elasticsearch
 
-__version__ = '2.1.0'
+__version__ = '2.1.1'
 
 logger = logging.getLogger(__name__)
 

curator/curator_script.py

@@ -18,7 +18,7 @@ class NullHandler(Handler):
         def emit(self, record):
             pass
 
-__version__ = '2.1.0'
+__version__ = '2.1.1'
 
 # Elasticsearch versions supported
 version_max  = (2, 0, 0)
@@ -147,7 +147,7 @@ def make_parser():
     parser_replicas.set_defaults(func=curator.replicas)
     add_common_args(parser_replicas)
     parser_replicas.add_argument('--older-than', required=True, help='Change replica count for indices older than n TIME_UNITs', type=int)
-    parser_replicas.add_argument('--replicas', required=True, help='Number of replicas the indices should have', type=int, default=1)
+    parser_replicas.add_argument('--count', dest='replicas', required=True, help='Number of replicas the indices should have', type=int, default=1)
 
     # Show indices
     parser_show = subparsers.add_parser('show', help='Show indices or snapshots')

docs/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.