Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq-artemis
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/911072ef Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/911072ef Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/911072ef Branch: refs/heads/master Commit: 911072ef24f20cfac7019826e069184cd873ff6b Parents: f22ac13 d00096f Author: Justin Bertram <jbert...@apache.org> Authored: Tue Mar 6 20:13:55 2018 -0600 Committer: Justin Bertram <jbert...@apache.org> Committed: Tue Mar 6 20:13:55 2018 -0600 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------