Merge with master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1fd8aa5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1fd8aa5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1fd8aa5 Branch: refs/heads/ignite-3477 Commit: c1fd8aa561406aedebb549819691cf66e815dc4a Parents: 871a069 Author: Ilya Lantukh <[email protected]> Authored: Thu Dec 22 18:04:41 2016 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Thu Dec 22 18:04:41 2016 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java | 2 +- .../distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java | 2 +- .../distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c1fd8aa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java index 4fe9f7a..0c8ae69 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java @@ -124,7 +124,7 @@ public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage { /** {@inheritDoc} */ @Override public byte directType() { - return -28; + return -27; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c1fd8aa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java index 32d164e..0af7cf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java @@ -648,7 +648,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat /** {@inheritDoc} */ @Override public byte directType() { - return -37; + return -36; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c1fd8aa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index 5d5eabb..18b6118 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -347,7 +347,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin /** {@inheritDoc} */ @Override public byte directType() { - return -36; + return 125; } /** {@inheritDoc} */
