diff options
| author | Mitch Garnaat <mitch@garnaat.com> | 2012-09-19 08:21:44 -0700 |
|---|---|---|
| committer | Mitch Garnaat <mitch@garnaat.com> | 2012-09-19 08:21:44 -0700 |
| commit | de9748147aae7a0ef347ab771d9d29913631fbc1 (patch) | |
| tree | b73f8ad778736607cd1a8a6a8a3b8431df498cfd /boto/cloudformation | |
| parent | f7b10ee94f5dbe64996f10f51d60dad9fec3fc2e (diff) | |
| parent | 24291683ab57edd4176bcacaea3d0f4f8a9d1716 (diff) | |
| download | boto-de9748147aae7a0ef347ab771d9d29913631fbc1.tar.gz | |
Merge branch 'ssl_cert_verification' into develop
Diffstat (limited to 'boto/cloudformation')
| -rw-r--r-- | boto/cloudformation/__init__.py | 2 | ||||
| -rw-r--r-- | boto/cloudformation/connection.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/boto/cloudformation/__init__.py b/boto/cloudformation/__init__.py index b6a1361e..53a02e5c 100644 --- a/boto/cloudformation/__init__.py +++ b/boto/cloudformation/__init__.py @@ -15,7 +15,7 @@ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. diff --git a/boto/cloudformation/connection.py b/boto/cloudformation/connection.py index 1c504f90..816066c0 100644 --- a/boto/cloudformation/connection.py +++ b/boto/cloudformation/connection.py @@ -50,7 +50,7 @@ class CloudFormationConnection(AWSQueryConnection): is_secure=True, port=None, proxy=None, proxy_port=None, proxy_user=None, proxy_pass=None, debug=0, https_connection_factory=None, region=None, path='/', - converter=None, security_token=None): + converter=None, security_token=None, validate_certs=True): if not region: region = RegionInfo(self, self.DefaultRegionName, self.DefaultRegionEndpoint, CloudFormationConnection) @@ -61,7 +61,8 @@ class CloudFormationConnection(AWSQueryConnection): proxy_user, proxy_pass, self.region.endpoint, debug, https_connection_factory, path, - security_token) + security_token, + validate_certs=validate_certs) def _required_auth_capability(self): return ['hmac-v4'] |