You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2015/06/22 14:57:21 UTC
[18/34] qpid-proton git commit: Merge branch 'master' into
kgiusti-python3
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/758295d2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/758295d2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/758295d2
Branch: refs/heads/master
Commit: 758295d2bb601dc34b6892027616bf0644674d38
Parents: 64a7ce2 fe3290b
Author: Ken Giusti <kg...@apache.org>
Authored: Wed Apr 29 15:36:52 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Wed Apr 29 15:36:52 2015 -0400
----------------------------------------------------------------------
CMakeLists.txt | 7 ++++++
proton-c/include/proton/sasl.h | 2 +-
proton-c/src/sasl/cyrus_sasl.c | 6 ++++-
proton-c/src/sasl/none_sasl.c | 5 ++--
proton-c/src/tests/CMakeLists.txt | 10 +++-----
.../apache/qpid/proton/engine/Transport.java | 4 +++
.../qpid/proton/engine/impl/FrameParser.java | 10 +++++++-
.../qpid/proton/engine/impl/FrameWriter.java | 7 ++++++
.../qpid/proton/engine/impl/TransportImpl.java | 12 +++++++++
proton-j/src/main/resources/cengine.py | 5 +++-
tests/python/proton_tests/engine.py | 21 ++++++++++++++++
tests/python/proton_tests/messenger.py | 26 +++++++++++---------
12 files changed, 92 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/758295d2/tests/python/proton_tests/engine.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/758295d2/tests/python/proton_tests/messenger.py
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org