Merge branch 'activemq-5.11.x' of https://git-wip-us.apache.org/repos/asf/activemq into activemq-5.11.x
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e756111d Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e756111d Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e756111d Branch: refs/heads/activemq-5.11.x Commit: e756111d0d1493bd0799a18ddae87e8c787111e5 Parents: c4a83c9 b1d3801 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Jun 24 19:05:45 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Jun 24 19:05:45 2015 +0200 ---------------------------------------------------------------------- .../apache/activemq/util/osgi/Activator.java | 77 +++++++++++++++----- 1 file changed, 58 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
