ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
Date Mon, 13 Mar 2017 16:34:53 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4768-1 26316bb06 -> 30611c7b7


Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c3120a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c3120a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c3120a9

Branch: refs/heads/ignite-4768-1
Commit: 7c3120a9482acefd9195f981559c297c1442cc88
Parents: c4e0ce3 0246b74
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 13 12:05:48 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 13 12:05:48 2017 +0300

----------------------------------------------------------------------
 .../dht/GridDhtTxFinishResponse.java            | 62 +++++++++-----------
 .../near/GridNearTxFinishResponse.java          |  5 +-
 2 files changed, 31 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7c3120a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 5646cb2,bc9503f..db4e801
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@@ -39,9 -39,9 +39,12 @@@ public class GridDhtTxFinishResponse ex
      /** */
      private static final long serialVersionUID = 0L;
  
+     /** Flag indicating if this is a check-committed response. */
+     private static final int CHECK_COMMITTED_FLAG_MASK = 0x01;
+ 
 +    /** */
-     private static final int NEAR_RES_FLAG_MASK = 0x01;
++    private static final int NEAR_RES_FLAG_MASK = 0x02;
 +
      /** Mini future ID. */
      private int miniId;
  


Mime
View raw message