Merge branch #65
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/f99a018a Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/f99a018a Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/f99a018a Branch: refs/heads/master Commit: f99a018a244296f49113b2ec510eaddf8d96e963 Parents: 475f232 e3656db Author: Martyn Taylor <[email protected]> Authored: Fri Jan 16 12:06:45 2015 +0000 Committer: Martyn Taylor <[email protected]> Committed: Fri Jan 16 12:06:45 2015 +0000 ---------------------------------------------------------------------- .../jms/server/impl/JMSServerManagerImpl.java | 9 ++++--- .../activemq/server/ActiveMQBootstrap.java | 28 +++++++------------- 2 files changed, 16 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
