Skip to content

Commit

Permalink
Merge pull request #386 from untergeek/vbump_3.2.0.dev0
Browse files Browse the repository at this point in the history
Version bumps, doc bumps for elastic.co
  • Loading branch information
untergeek committed May 21, 2015
2 parents 32592dc + 8442d24 commit b3295f9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changelog
=========

3.1.0 (21 May 2015)
-------------
-------------------

**General**

Expand All @@ -22,7 +22,7 @@ Changelog
* Added tests for ``es_repo_mgr`` in #350
* Doc fixes

** Bug fixes**
**Bug fixes**

* delete-by-space needed the same fix used for #245. Fixed in #353 (untergeek)
* Increase default client timeout for ``es_repo_mgr`` as node discovery and
Expand Down
2 changes: 1 addition & 1 deletion curator/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.1.0'
__version__ = '3.2.0.dev0'
4 changes: 2 additions & 2 deletions docs/asciidoc/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:curator_version: 3.0.3
:es_py_version: 1.4.0
:curator_version: 3.1.0
:es_py_version: 1.5.0
:ref: http://www.elastic.co/guide/en/elasticsearch/reference/current

[[curator-reference]]
Expand Down

0 comments on commit b3295f9

Please sign in to comment.