Merge pull request #93 from untergeek/1.1.0

Curator 1.1.0 Release
elastic · Jun 13, 2014 · 72e6ece · 72e6ece
2 parents 0925aac + 1b31161
commit 72e6ece
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-1.1.0 (???)
+1.1.0 (12 June 2014)
  # General
  - Updated! New command structure
  - New! Snapshot to fs or s3 #82 (untergeek)
@@ -12,6 +12,10 @@
  - Fix --max_num_segments not being passed correctly #74 (untergeek)
  - Change BUILD_NUMBER to CURATOR_BUILD_NUMBER in setup.py #60 (mohabusama)
  - Fix off-by-one error in time calculations #66 (untergeek)
+ - Fix testing with python3 #92 (untergeek)
+
+ # Errata
+ - Removed optparse compatibility.  Now requires argparse.
 
 1.0.0 (25 Mar 2014)
  # General

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Curator
 
 Have time-series indices in Elasticsearch? This is the tool for you!
+See the new [Documentation Wiki](http://github.com/elasticsearch/curator/wiki)!
 
 ## Versioning
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.0-dev
+1.1.0
diff --git a/curator/curator.py b/curator/curator.py
@@ -17,7 +17,7 @@ class NullHandler(Handler):
         def emit(self, record):
             pass
 
-__version__ = '1.1.0-dev'
+__version__ = '1.1.0'
 
 # Elasticsearch versions supported
 version_max  = (2, 0, 0)
@@ -158,7 +158,6 @@ def make_parser():
     snapshot_group.add_argument('--older-than', type=int, help='Capture snapshots for indices older than n TIME_UNITs.')
     snapshot_group.add_argument('--most-recent', type=int, help='Capture snapshots for n most recent number of indices.')
     snapshot_group.add_argument('--delete-older-than', type=int, help='Delete snapshots older than n TIME_UNITs.')
-    snapshot_group.add_argument('--show-snapshots', action='store_true', help='Show all snapshots in REPOSITORY.')
 
     parser_snapshot.add_argument('--no_wait_for_completion', action='store_false',
                                 help='Do not wait until complete to return. Waits by default.', default=DEFAULT_ARGS['wait_for_completion'])

diff --git a/curator/es_repo_mgr.py b/curator/es_repo_mgr.py
@@ -16,7 +16,7 @@ class NullHandler(Handler):
         def emit(self, record):
             pass
 
-__version__ = '1.1.0-dev'
+__version__ = '1.1.0'
 
 # Elasticsearch versions supported
 version_max  = (2, 0, 0)