Merge branch 'master' into kgiusti-python3
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6069e1f4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6069e1f4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6069e1f4 Branch: refs/heads/kgiusti-python3 Commit: 6069e1f4e974f261f23bbf45543733d9db003e7e Parents: dff246b 98e27c6 Author: Ken Giusti <kgiu...@apache.org> Authored: Thu Jun 18 13:55:06 2015 -0400 Committer: Ken Giusti <kgiu...@apache.org> Committed: Thu Jun 18 13:55:06 2015 -0400 ---------------------------------------------------------------------- .travis.yml | 12 +- proton-c/bindings/python/proton/__init__.py | 7 +- proton-c/bindings/ruby/CMakeLists.txt | 18 ++- proton-c/include/proton/cproton.i | 2 - proton-c/include/proton/transport.h | 16 +- proton-c/src/engine/engine-internal.h | 14 +- proton-c/src/engine/engine.c | 16 +- proton-c/src/messenger/messenger.c | 5 +- proton-c/src/sasl/cyrus_sasl.c | 2 +- proton-c/src/sasl/sasl.c | 2 +- proton-c/src/transport/transport.c | 124 +++++++++++++-- tests/python/proton_tests/engine.py | 48 +++++- tests/python/proton_tests/transport.py | 190 +++++++++++++++++++++-- 13 files changed, 418 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6069e1f4/proton-c/bindings/python/proton/__init__.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6069e1f4/tests/python/proton_tests/engine.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6069e1f4/tests/python/proton_tests/transport.py ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
