diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-13 23:50:18 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-13 23:50:18 +0000 |
| commit | 057a0635e081848ba59964c4a8e0923e521b7fe6 (patch) | |
| tree | cdad9578140d5dbdb2e90525e2ba9cc870ca50b6 /qpid/python/qpid/messaging/endpoints.py | |
| parent | cf61dbf9b313f9bd69b392eae8fd8d27d4e609a2 (diff) | |
| download | qpid-python-qpid-3603-5.tar.gz | |
Merge branch 'qpid-3603-4-rebase' into qpid-3603-5qpid-3603-5
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-5@1243748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python/qpid/messaging/endpoints.py')
| -rw-r--r-- | qpid/python/qpid/messaging/endpoints.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py index faa382a755..e632c0c5b8 100644 --- a/qpid/python/qpid/messaging/endpoints.py +++ b/qpid/python/qpid/messaging/endpoints.py @@ -170,6 +170,7 @@ class Connection(Endpoint): self.ssl_keyfile = options.get("ssl_keyfile", None) self.ssl_certfile = options.get("ssl_certfile", None) self.ssl_trustfile = options.get("ssl_trustfile", None) + self.client_properties = options.get("client_properties", {}) self.options = options |