Merge branch 'master' into examples

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

Branch: refs/heads/examples
Commit: d02fdad17003d17f9a6ebce71757ab39f6bdc241
Parents: 0fd8b1f 36f81e0
Author: Gordon Sim <[email protected]>
Authored: Wed Nov 26 16:03:07 2014 +0000
Committer: Gordon Sim <[email protected]>
Committed: Wed Nov 26 16:03:07 2014 +0000

----------------------------------------------------------------------
 proton-c/CMakeLists.txt                         |    1 +
 .../bindings/perl/lib/qpid/proton/Message.pm    |    2 +-
 proton-c/bindings/perl/lib/qpid/proton/utils.pm |    2 +-
 proton-c/bindings/perl/lib/qpid_proton.pm       |    1 +
 proton-c/bindings/python/CMakeLists.txt         |   83 +-
 proton-c/bindings/python/proton.py              | 3875 -----------------
 proton-c/bindings/python/proton/__init__.py     | 3894 ++++++++++++++++++
 proton-c/bindings/python/setup.py.in            |  107 -
 proton-c/bindings/ruby/lib/qpid_proton.rb       |    4 +-
 proton-c/bindings/ruby/lib/qpid_proton/array.rb |   10 +-
 proton-c/bindings/ruby/lib/qpid_proton/data.rb  |   10 +-
 .../bindings/ruby/lib/qpid_proton/described.rb  |    4 +-
 .../ruby/lib/qpid_proton/exception_handling.rb  |   53 +-
 .../bindings/ruby/lib/qpid_proton/exceptions.rb |    8 +-
 .../bindings/ruby/lib/qpid_proton/filters.rb    |    8 +-
 proton-c/bindings/ruby/lib/qpid_proton/hash.rb  |    6 +-
 .../bindings/ruby/lib/qpid_proton/mapping.rb    |   11 +-
 .../bindings/ruby/lib/qpid_proton/message.rb    |    8 +-
 .../ruby/lib/qpid_proton/message_format.rb      |    8 +-
 .../bindings/ruby/lib/qpid_proton/messenger.rb  |   92 +-
 .../bindings/ruby/lib/qpid_proton/selectable.rb |    8 +-
 .../bindings/ruby/lib/qpid_proton/strings.rb    |    6 +-
 .../ruby/lib/qpid_proton/subscription.rb        |    8 +-
 .../bindings/ruby/lib/qpid_proton/tracker.rb    |    8 +-
 .../ruby/lib/qpid_proton/tracker_status.rb      |    8 +-
 .../bindings/ruby/lib/qpid_proton/version.rb    |   11 +-
 .../ruby/spec/qpid/proton/messenger_spec.rb     |   16 +
 proton-c/include/proton/cproton.i               |    2 +-
 proton-c/include/proton/sasl.h                  |   20 +-
 proton-c/include/proton/ssl.h                   |    6 +
 proton-c/include/proton/transport.h             |   20 +-
 proton-c/src/engine/engine-internal.h           |   36 +-
 proton-c/src/messenger/messenger.c              |    3 +-
 proton-c/src/posix/driver.c                     |    8 +-
 proton-c/src/proton.c                           |   10 +-
 proton-c/src/sasl/sasl-internal.h               |    6 +-
 proton-c/src/sasl/sasl.c                        |  294 +-
 proton-c/src/ssl/openssl.c                      |  452 +-
 proton-c/src/ssl/ssl-internal.h                 |    6 +-
 proton-c/src/ssl/ssl_stub.c                     |   22 +-
 proton-c/src/tests/engine.c                     |    3 +
 proton-c/src/transport/autodetect.c             |  135 +
 proton-c/src/transport/autodetect.h             |   40 +
 proton-c/src/transport/transport.c              |  422 +-
 proton-c/src/windows/driver.c                   |    8 +-
 proton-c/src/windows/schannel.c                 |  371 +-
 .../qpid/proton/amqp/messaging/Accepted.java    |    3 +
 .../qpid/proton/amqp/messaging/Modified.java    |    3 +
 .../qpid/proton/amqp/messaging/Rejected.java    |    2 +
 .../qpid/proton/amqp/messaging/Released.java    |    3 +
 .../qpid/proton/amqp/transaction/Declared.java  |    3 +
 .../qpid/proton/codec/impl/ArrayElement.java    |   13 +
 .../apache/qpid/proton/codec/impl/DataImpl.java |   10 +
 .../qpid/proton/engine/impl/SaslImpl.java       |    7 +-
 proton-j/src/main/resources/cengine.py          |    5 +-
 proton-j/src/main/resources/csasl.py            |   14 +-
 proton-j/src/main/resources/cssl.py             |    3 +
 .../qpid/proton/codec/impl/DataImplTest.java    |   84 +
 tests/python/proton_tests/common.py             |   13 +-
 tests/python/proton_tests/engine.py             |    3 -
 tests/python/proton_tests/sasl.py               |   14 +-
 tests/ruby/proton_tests/smoke.rb                |    4 +-
 62 files changed, 5354 insertions(+), 4946 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to