Merge pr #201
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/efce1d7a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/efce1d7a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/efce1d7a Branch: refs/heads/master Commit: efce1d7a71253e957f5aa909a158652fbff4be5a Parents: b0b567b 2ea977d Author: Martyn Taylor <[email protected]> Authored: Mon Oct 19 15:03:23 2015 +0100 Committer: Martyn Taylor <[email protected]> Committed: Mon Oct 19 15:03:23 2015 +0100 ---------------------------------------------------------------------- .../apache/activemq/artemis/boot/Artemis.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
