You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/03/02 12:35:13 UTC

[1/2] activemq-6 git commit: Fix openwire example config issue

Repository: activemq-6
Updated Branches:
  refs/heads/master 89f4cb82e -> 2e0e662c0


Fix openwire example config issue


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

Branch: refs/heads/master
Commit: c101d1001bde433fe38ace1a04e02f1aba27835b
Parents: a1df177
Author: Howard Gao <hg...@redhat.com>
Authored: Mon Mar 2 13:02:43 2015 +0800
Committer: Howard Gao <hg...@redhat.com>
Committed: Mon Mar 2 13:02:43 2015 +0800

----------------------------------------------------------------------
 .../src/main/resources/activemq/server0/activemq-configuration.xml  | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c101d100/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
index 7c28bff..6025111 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -43,7 +43,6 @@ under the License.
 
       <!-- Acceptors -->
       <acceptors>
-         <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
          <acceptor name="openwire-acceptor">tcp://localhost:61616?protocols=OPENWIRE</acceptor>
       </acceptors>
 


[2/2] activemq-6 git commit: merge #126 - Fix openwire example config issue

Posted by an...@apache.org.
merge #126 - Fix openwire example config issue


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

Branch: refs/heads/master
Commit: 2e0e662c07e57ff5b5f025227b24d1bb6168f48c
Parents: 89f4cb8 c101d10
Author: Andy Taylor <an...@gmail.com>
Authored: Mon Mar 2 11:34:38 2015 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Mon Mar 2 11:34:38 2015 +0000

----------------------------------------------------------------------
 .../src/main/resources/activemq/server0/activemq-configuration.xml  | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------