Merge branch 'release/1.0.5'

skymill · May 18, 2016 · 70cfa1f · 70cfa1f
2 parents b1c7f81 + 63db071
commit 70cfa1f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/README.rst b/README.rst
@@ -3,25 +3,25 @@ Cumulus Deployment Suite
 
 **Cumulus**
 
-.. image:: https://pypip.in/v/cumulus/badge.png
+.. image:: https://img.shields.io/pypi/v/cumulus.svg
     :target: https://pypi.python.org/pypi/cumulus/
     :alt: Latest Version
-.. image:: https://pypip.in/d/cumulus/badge.png
+.. image:: https://img.shields.io/pypi/dm/cumulus.svg
     :target: https://pypi.python.org/pypi/cumulus/
     :alt: Downloads
-.. image:: https://pypip.in/license/cumulus/badge.png
+.. image:: https://img.shields.io/pypi/l/cumulus.svg
     :target: https://pypi.python.org/pypi/cumulus/
     :alt: License
 
 **Cumulus Bundle Handler**
 
-.. image:: https://pypip.in/v/cumulus-bundle-handler/badge.png
+.. image:: https://img.shields.io/pypi/v/cumulus-bundle-handler.svg
     :target: https://pypi.python.org/pypi/cumulus-bundle-handler/
     :alt: Latest Version
-.. image:: https://pypip.in/d/cumulus-bundle-handler/badge.png
+.. image:: https://img.shields.io/pypi/dm/cumulus-bundle-handler.svg
     :target: https://pypi.python.org/pypi/cumulus-bundle-handler/
     :alt: Downloads
-.. image:: https://pypip.in/license/cumulus-bundle-handler/badge.png
+.. image:: https://img.shields.io/pypi/l/cumulus-bundle-handler.svg
     :target: https://pypi.python.org/pypi/cumulus-bundle-handler/
     :alt: License
 

diff --git a/cumulus-bundle-handler/cumulus_bundle_handler/script_executor.py b/cumulus-bundle-handler/cumulus_bundle_handler/script_executor.py
@@ -34,7 +34,7 @@ def run_init_scripts(start=False, kill=False, other=False):
     LOGGER.info('Running init scripts from {}'.format(init_dir))
 
     filenames = []
-    for filename in os.listdir(init_dir):
+    for filename in sorted(os.listdir(init_dir)):
         if ospath.isfile(ospath.join(init_dir, filename)):
             filenames.append(ospath.join(init_dir, filename))
 

diff --git a/cumulus-bundle-handler/cumulus_bundle_handler/settings.conf b/cumulus-bundle-handler/cumulus_bundle_handler/settings.conf
@@ -1,2 +1,2 @@
 [general]
-version: 1.0.4
+version: 1.0.5
diff --git a/docs/cumulus_release_notes.rst b/docs/cumulus_release_notes.rst
@@ -307,6 +307,13 @@ Initial release with some basic functions and concepts.
 Cumulus Bundle Handler release notes
 ====================================
 
+1.0.5
+-----
+
+**Release date:** 2016-05-17
+
+- Fixed script execution ordering issue, now properly honors numbering (S01-script1, S05-script2, S30-script3)
+
 1.0.4
 -----