You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2018/03/07 02:15:39 UTC
[1/2] activemq-artemis git commit: NO-JIRA fix checkstyle
Repository: activemq-artemis
Updated Branches:
refs/heads/master d00096ffe -> 911072ef2
NO-JIRA fix checkstyle
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f22ac131
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f22ac131
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f22ac131
Branch: refs/heads/master
Commit: f22ac131b8e4fe422a20eb5fd7068ecdad2921f2
Parents: d58c23c
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Mar 6 20:12:51 2018 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Mar 6 20:13:16 2018 -0600
----------------------------------------------------------------------
.../org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f22ac131/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
index b40ef59..62e75a7 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
@@ -2034,7 +2034,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable {
if (val5 != null) {
cf.setDeserializationWhiteList(val5);
}
-
+
cf.setIgnoreJTA(isIgnoreJTA());
}
[2/2] activemq-artemis git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/activemq-artemis
Posted by jb...@apache.org.
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 <jb...@apache.org>
Authored: Tue Mar 6 20:13:55 2018 -0600
Committer: Justin Bertram <jb...@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(-)
----------------------------------------------------------------------