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/04 10:19:09 UTC
[3/3] activemq-6 git commit: Merge #138
Merge #138
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/8041f1f9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/8041f1f9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/8041f1f9
Branch: refs/heads/master
Commit: 8041f1f947acd5151a773d093fbb17f481805d69
Parents: 2d58848 a43be0c
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Mar 4 09:18:45 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Mar 4 09:18:45 2015 +0000
----------------------------------------------------------------------
.../apache/activemq/core/version/Version.java | 2 -
.../activemq/core/version/impl/VersionImpl.java | 34 +---------------
.../apache/activemq/utils/VersionLoader.java | 2 -
.../main/resources/activemq-version.properties | 1 -
activemq-native/pom.xml | 43 ++++++++++++++++++++
.../core/remoting/impl/netty/NettyAcceptor.java | 2 +-
.../core/server/ActiveMQServerLogger.java | 24 ++++-------
.../core/version/impl/VersionImplTest.java | 11 ++---
.../activemq/component/WebServerComponent.java | 2 +-
pom.xml | 8 ++--
.../tests/unit/util/VersionLoaderTest.java | 1 -
11 files changed, 61 insertions(+), 69 deletions(-)
----------------------------------------------------------------------