Merge branches 'ignite-gg-11729' and 'ignite-gg-8.0.2.ea1' of https://github.com/gridgain/apache-ignite into ignite-gg-11729
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java Merge branches 'ignite-gg-11729' and 'ignite-gg-8.0.2.ea1' of https://github.com/ggprivate/ggprivate into ignite-gg-11729 # Conflicts: # modules/pds/src/main/java/org/gridgain/grid/internal/processors/cache/database/GridCacheDatabaseSharedManager.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f9be208 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f9be208 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f9be208 Branch: refs/heads/ignite-3477 Commit: 9f9be208414fb141c192b5d6c688021acd09ec25 Parents: dffee01 Author: Ilya Lantukh <[email protected]> Authored: Tue Dec 20 23:33:03 2016 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Tue Dec 20 23:33:03 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/pagemem/snapshot/SnapshotProgressMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f9be208/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotProgressMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotProgressMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotProgressMessage.java index 8de4c40..2fb9643 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotProgressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotProgressMessage.java @@ -120,7 +120,7 @@ public class SnapshotProgressMessage implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -38; + return -39; } /** {@inheritDoc} */
