activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [4/4] activemq-6 git commit: Merge #20
Date Thu, 20 Nov 2014 10:03:19 GMT
Merge #20


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

Branch: refs/heads/master
Commit: c05041e2d5481f26aadf602440fad4f497b3f778
Parents: 3c83324 a09a8dd
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Thu Nov 20 10:02:53 2014 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Thu Nov 20 10:02:53 2014 +0000

----------------------------------------------------------------------
 .../org/apache/activemq/cli/banner.txt             | 10 +++++-----
 .../test/resources/live-only-hapolicy-config.xml   |  2 +-
 .../test/resources/live-only-hapolicy-config2.xml  |  2 +-
 .../test/resources/live-only-hapolicy-config3.xml  |  2 +-
 .../test/resources/live-only-hapolicy-config4.xml  |  2 +-
 .../test/resources/live-only-hapolicy-config5.xml  |  2 +-
 .../src/test/resources/replica-hapolicy-config.xml |  2 +-
 .../test/resources/replica-hapolicy-config2.xml    |  2 +-
 .../test/resources/replica-hapolicy-config3.xml    |  2 +-
 .../test/resources/replicated-hapolicy-config.xml  |  2 +-
 .../config/replicated/activemq-configuration.xml   |  2 +-
 .../config/shared-store/activemq-configuration.xml |  2 +-
 .../en/ActiveMQ_QuickStart_Guide.ent               |  5 +++++
 .../en/ActiveMQ_QuickStart_Guide.xml               | 17 +++++++++++++++++
 .../en/HornetQ_QuickStart_Guide.ent                |  5 -----
 .../en/HornetQ_QuickStart_Guide.xml                | 17 -----------------
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  4 ++--
 .../hornetq/server1/activemq-configuration.xml     |  4 ++--
 examples/jms/clustered-standalone/readme.html      |  4 ++--
 .../resources/hornetq/server0/activemq-users.xml   |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server2/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server2/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server2/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../hornetq/server0/activemq-configuration.xml     |  2 +-
 .../hornetq/server1/activemq-configuration.xml     |  2 +-
 .../soak/normal/server0/activemq-configuration.xml |  2 +-
 41 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------



Mime
View raw message