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:16 UTC
[13/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/64cb4faf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/64cb4faf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/64cb4faf
Branch: refs/heads/master
Commit: 64cb4faf80e5244bde672c54f3372ae2d18dfa11
Parents: 9380ed9 f05810e
Author: Ken Giusti <kg...@apache.org>
Authored: Mon Apr 27 15:34:13 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Mon Apr 27 15:34:13 2015 -0400
----------------------------------------------------------------------
.travis.yml | 6 +
CMakeLists.txt | 2 +-
DEVELOPERS | 36 ---
DEVELOPERS.md | 86 ++++++
INSTALL.md | 168 ++++++++++++
README | 259 -------------------
README.md | 40 +++
bin/jenkins-proton-c-build.sh | 46 ++++
jenkins-proton-c-build.sh | 41 ---
proton-c/include/proton/condition.h | 1 -
proton-c/include/proton/connection.h | 1 -
proton-c/include/proton/delivery.h | 1 -
proton-c/include/proton/disposition.h | 1 -
proton-c/include/proton/event.h | 1 -
proton-c/include/proton/io.h | 2 +-
proton-c/include/proton/link.h | 1 -
proton-c/include/proton/message.h | 1 -
proton-c/include/proton/sasl.h | 8 +-
proton-c/include/proton/scanner.h | 2 +-
proton-c/include/proton/session.h | 1 -
proton-c/include/proton/ssl.h | 1 -
proton-c/include/proton/terminus.h | 1 -
proton-c/include/proton/transport.h | 1 -
proton-c/include/proton/type_compat.h | 11 +-
proton-c/include/proton/types.h | 3 +-
proton-c/src/dispatcher/dispatcher.h | 1 -
proton-c/src/framing/framing.h | 1 -
proton-c/src/sasl/cyrus_sasl.c | 9 +
proton-c/src/transport/transport.c | 5 +
proton-c/src/util.c | 1 -
proton-c/src/util.h | 1 -
.../qpid/proton/engine/impl/SessionImpl.java | 51 +++-
.../qpid/proton/engine/impl/TransportImpl.java | 25 +-
.../qpid/proton/engine/impl/TransportLink.java | 29 ++-
.../proton/engine/impl/TransportSession.java | 54 +++-
tests/python/proton_tests/engine.py | 81 +++---
36 files changed, 537 insertions(+), 442 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/64cb4faf/tests/python/proton_tests/engine.py
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org