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/07/27 18:29:21 UTC

[2/2] qpid-proton git commit: Merge branch 'master' into PROTON-958

Merge branch 'master' into PROTON-958


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/343d742f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/343d742f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/343d742f

Branch: refs/heads/master
Commit: 343d742f50e295751ac9822384bf5acd4abd0093
Parents: 4b306ad a9b3fbc
Author: Ken Giusti <kg...@apache.org>
Authored: Mon Jul 27 12:06:58 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Mon Jul 27 12:06:58 2015 -0400

----------------------------------------------------------------------
 proton-c/src/dispatcher/dispatcher.c            |   2 +-
 .../org/apache/qpid/proton/TestDecoder.java     |   2 -
 .../org/apache/qpid/proton/amqp/Binary.java     |   2 -
 .../qpid/proton/engine/impl/DeliveryImpl.java   |   6 -
 .../qpid/proton/engine/impl/FrameWriter.java    |  49 +++----
 .../qpid/proton/engine/impl/StringUtils.java    |  92 +++++++++++++
 .../qpid/proton/engine/impl/TransportImpl.java  |  37 ++---
 .../proton/engine/impl/StringUtilsTest.java     | 136 +++++++++++++++++++
 8 files changed, 267 insertions(+), 59 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org