Skip to content

Commit

Permalink
Merge branch 'master' into 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
untergeek committed Jul 1, 2016
2 parents bbbc34f + 9cc23bf commit b14e350
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
- ES_VERSION=2.1.1
- ES_VERSION=2.2.2
- ES_VERSION=2.3.3
- ES_VERSION=5.0.0-alpha3
- ES_VERSION=5.0.0-alpha4

os: linux

Expand Down
2 changes: 1 addition & 1 deletion curator/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '4.0.1a'
__version__ = '4.0.1'
4 changes: 2 additions & 2 deletions docs/Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Changelog
=========

4.0.1 (? ? ?)
-------------
4.0.1 (1 July 2016)
-------------------

**Bug Fixes**

Expand Down
2 changes: 1 addition & 1 deletion docs/asciidoc/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:curator_version: 4.0.0
:curator_version: 4.0.1
:curator_major: 4
:es_py_version: 2.3.0
:ref: http://www.elastic.co/guide/en/elasticsearch/reference/current
Expand Down

0 comments on commit b14e350

Please sign in to comment.