You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/03/16 18:31:14 UTC

[3/3] activemq-6 git commit: Merge PR #187 and #188

Merge PR #187 and #188


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/c062d68a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/c062d68a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/c062d68a

Branch: refs/heads/master
Commit: c062d68a4997fb25d7fbf169df72b9d4298c6874
Parents: 0d599b8 6a45d94
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Mar 16 17:30:57 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Mar 16 17:30:57 2015 +0000

----------------------------------------------------------------------
 examples/core/embedded-remote/readme.html       |   2 +-
 examples/core/embedded/readme.html              |   2 +-
 examples/jms/proton-cpp/pom.xml                 |  57 ++++----
 .../activemq/jms/example/ProtonCPPExample.java  | 141 +++++++++++++++++++
 .../src/main/resources/jndi.properties          |  20 +++
 .../jms/proton-ruby/src/main/scripts/receive.rb |   9 +-
 .../jms/proton-ruby/src/main/scripts/send.rb    |   4 +-
 7 files changed, 200 insertions(+), 35 deletions(-)
----------------------------------------------------------------------