Update contributors and documentation

elvarb · Jan 5, 2016 · bfbadf0 · bfbadf0
1 parent 7f9adab
commit bfbadf0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -64,3 +64,8 @@ Contributors:
 * Steven Ottenhoff (steffo)
 * Ole Rößner (Basster)
 * Jack (univerio)
+* Tomáš Mózes (hydrapolic)
+* Gary Gao (garyelephant)
+* Panagiotis Moustafellos (pmoust)
+* (pbamba)
+* Pavel Strashkin (xaka)
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,15 +3,20 @@
 Changelog
 =========
 
-3.4.x (? ? ?)
+3.5.x (? ? ?)
 -------------
 
 **General**
 
   * Update license copyright to 2016
-
+  * Use slim python version with Docker #527 (xaka)
+
 **Bug fixes**
 
+  * Fix sphinx documentation build error #506 (hydrapolic)
+  * Ensure snapshots are found before iterating #507 (garyelephant)
+  * Fix a doc inconsistency #509 (pmoust)
+  * Fix a typo in `show` documentation #513 (pbamba)
   * Default to trying the cluster state for checking whether indices are closed, and
     then fall back to using the _cat API (for Amazon ES instances). #519 (untergeek)
   * Improve logging to show time delay between optimize runs, if selected. #525 (untergeek)

diff --git a/docs/asciidoc/misc/examples.asciidoc b/docs/asciidoc/misc/examples.asciidoc
@@ -78,5 +78,5 @@ curator --host 10.0.0.2 close indices --exclude do-not-touch --exclude logstash-
 
 &nbsp;
 
-In this case, all indices saving those matching pattern `kibana`, or all
+In this case, all indices saving those matching pattern `do-not-touch`, or all
 Logstash indices for the month of March 2015 will be closed.