Merge pull request #148 from zoufou/v0.6-beta

v0.6b11
jookies · May 12, 2015 · 9b23cfc · 9b23cfc
2 parents b4786d3 + 03408aa
commit 9b23cfc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ python:
 # Command to install dependencies
 install:
     - python setup.py sdist
-    - sudo pip install dist/jasmin-0.6b10.tar.gz
+    - sudo pip install dist/jasmin-0.6b11.tar.gz
 # Commands to run tests:
 script:
     # Add jasmind to system autostartup:

diff --git a/jasmin/__init__.py b/jasmin/__init__.py
@@ -5,7 +5,7 @@
 
 MAJOR = 0
 MINOR = 6
-PATCH = 10
+PATCH = 11
 META = 'b'
 
 def get_version():
@@ -16,4 +16,4 @@ def get_release():
     return '%s.%s%s%s' % (MAJOR, MINOR, META, PATCH)
 
 __version__ = get_version()
-__release__ = get_release()
+__release__ = get_release()
diff --git a/jasmin/routing/configs.py b/jasmin/routing/configs.py
@@ -37,8 +37,8 @@ def __init__(self, config_file = None):
         ConfigFile.__init__(self, config_file)
 
         self.timeout = self._getint('deliversm-thrower', 'http_timeout', 30)
-        self.retryDelay = self._getint('deliversm-thrower', 'retry_delay', 30)
-        self.maxRetries = self._getint('deliversm-thrower', 'max_retries', 3)
+        self.retry_delay = self._getint('deliversm-thrower', 'retry_delay', 30)
+        self.max_retries = self._getint('deliversm-thrower', 'max_retries', 3)
 
         # Logging
         self.log_level = logging.getLevelName(self._get('deliversm-thrower', 'log_level', 'INFO'))

diff --git a/jasmin/routing/test/test_routing_deliver_sm.py b/jasmin/routing/test/test_routing_deliver_sm.py
@@ -50,8 +50,8 @@ def setUp(self):
         deliverSmThrowerConfigInstance = deliverSmThrowerConfig()
         # Lower the timeout config to pass the timeout tests quickly
         deliverSmThrowerConfigInstance.timeout = 2
-        deliverSmThrowerConfigInstance.retryDelay = 1
-        deliverSmThrowerConfigInstance.maxRetries = 2
+        deliverSmThrowerConfigInstance.retry_delay = 1
+        deliverSmThrowerConfigInstance.max_retries = 2
 
         # Launch the deliverSmThrower
         self.deliverSmThrower = deliverSmThrower()