Author: tomaz
Date: Tue May 7 20:43:14 2013
New Revision: 1480066
URL: http://svn.apache.org/r1480066
Log:
Backport commit from trunk.
Modified:
libcloud/branches/0.12.x/ (props changed)
libcloud/branches/0.12.x/CHANGES
libcloud/branches/0.12.x/libcloud/security.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1480063
Modified: libcloud/branches/0.12.x/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1480066&r1=1480065&r2=1480066&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Tue May 7 20:43:14 2013
@@ -2,6 +2,13 @@
Changes with Apache Libcloud in deveploment:
+ *) General
+
+ - Add homebrew curl-ca-bundle path to CA_CERTS_PATH. This will make Libcloud
+ use homebrew curl ca bundle file (if available) for server certificate
+ validation. (LIBCLOUD-324)
+ [Robert Chiniquy]
+
*) Compute
- Fix destroy_node method in the experimental libvirt driver.
Modified: libcloud/branches/0.12.x/libcloud/security.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/security.py?rev=1480066&r1=1480065&r2=1480066&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/security.py (original)
+++ libcloud/branches/0.12.x/libcloud/security.py Tue May 7 20:43:14 2013
@@ -42,6 +42,9 @@ CA_CERTS_PATH = [
# macports: curl-ca-bundle
'/opt/local/share/curl/curl-ca-bundle.crt',
+
+ # homebrew: curl-ca-bundle
+ '/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt',
]
# Allow user to explicitly specify which CA bundle to use, using an environment
