Merge branch 'develop'

robertpeteuil · Feb 9, 2018 · ff4d8e8 · ff4d8e8
2 parents b96c716 + e194954
commit ff4d8e8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ dist/
 __pycache__/
 *.so
 *~
+.vscode/
 
 # due to using testing tools
 test.py

diff --git a/mcc/cldcnct.py b/mcc/cldcnct.py
@@ -27,6 +27,8 @@
 from gevent.pool import Group
 from gevent import monkey
 import gevent
+monkey.patch_all()
+
 from libcloud.compute.types import Provider
 from libcloud.compute.providers import get_driver
 from libcloud.common.types import InvalidCredsError
@@ -35,7 +37,6 @@
 from mcc.confdir import CONFIG_DIR
 import sys
 
-monkey.patch_all()
 
 
 def get_conns(cred, providers):

diff --git a/mcc/core.py b/mcc/core.py
@@ -32,7 +32,7 @@
 import os
 import sys
 
-__version__ = "0.9.2"
+__version__ = "0.9.3"
 
 
 def main():

diff --git a/setup.py b/setup.py
@@ -64,7 +64,7 @@
     package_data={'mcc': ['config.ini']},
     entry_points={'console_scripts': ['mcc=mcc.core:main',
                                       'mccl=mcc.core:list_only']},
-    version='0.9.2',
+    version='0.9.3',
     author="Robert Peteuil",
     author_email="[email protected]",
     url='https://github.com/robertpeteuil/multi-cloud-control',
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ dist/ @@
     __pycache__/
     *.so
     *~
+    .vscode/
     # due to using testing tools
     test.py
@@ Expand Down @@