Merge pull request #2131 from apache/update-changelog

Update changelog with verify_ssl option for VSphere

CHANGES.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 69e838c..0fd3472 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,12 @@
 Compute
 ~~~~~~~
 
+- [VSphere] Add verify_ssl option
+
+  Add verify_ssl option, to enable the user to avoid SSL verification explicitly.
+  (#2128)
+  [Miguel Caballer - @micafer]
+
 - [OpenStack] Initial Blazar support
 
   This is an initial implementation of Blazar support in Libcloud. It currently

scripts/time_imports.sh

diff --git a/scripts/time_imports.sh b/scripts/time_imports.sh
index f306989..05cb34d 100755
--- a/scripts/time_imports.sh
+++ b/scripts/time_imports.sh
@@ -18,7 +18,7 @@
 set -e
 
 # Script which fails if any of the import takes more than threshold ms
-LIBCLOUD_CUMULATIVE_IMPORT_TIME_LIMIT_US=800000
+LIBCLOUD_CUMULATIVE_IMPORT_TIME_LIMIT_US=1000000
 EC2_DRIVER_CUMULATIVE_IMPORT_TIME_LIMIT_US=560000
 
 # Clean up any cached files to ensure consistent and clean environment