ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/50] [abbrv] ignite git commit: Merge branch 'GG-11860' into ignite-gg-8.0.3.ea2
Date Wed, 03 May 2017 07:21:44 GMT
Merge branch 'GG-11860' into ignite-gg-8.0.3.ea2

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java


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

Branch: refs/heads/ignite-gg-8.0.3.ea6-clients-test
Commit: 1f70cd62065fea359b3b9cb98562a650fa5a8c68
Parents: a19f94b e14cab1
Author: EdShangGG <eshangareev@gridgain.com>
Authored: Thu Feb 16 21:07:24 2017 +0300
Committer: EdShangGG <eshangareev@gridgain.com>
Committed: Thu Feb 16 21:07:24 2017 +0300

----------------------------------------------------------------------
 .../snapshot/SnapshotFinishedMessage.java       |  32 ++++-
 .../pagemem/snapshot/SnapshotOperation.java     |  31 +++++
 .../StartFullSnapshotAckDiscoveryMessage.java   | 132 -------------------
 .../StartFullSnapshotDiscoveryMessage.java      |   4 +-
 ...artSnapshotOperationAckDiscoveryMessage.java | 129 ++++++++++++++++++
 .../GridCachePartitionExchangeManager.java      |  10 +-
 .../processors/cache/GridCacheProcessor.java    |   6 +-
 .../IgniteCacheDatabaseSharedManager.java       |  12 +-
 .../GridDhtPartitionsExchangeFuture.java        |  12 +-
 .../resources/META-INF/classnames.properties    |   2 +-
 10 files changed, 203 insertions(+), 167 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1f70cd62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
index 0b15480,a5fdeef..95ed3ae
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
@@@ -19,10 -19,7 +19,9 @@@ package org.apache.ignite.internal.proc
  
  import java.io.File;
  import java.util.Collection;
- import java.util.UUID;
  import org.apache.ignite.IgniteCheckedException;
 +import org.apache.ignite.IgniteLogger;
 +import org.apache.ignite.cluster.ClusterNode;
  import org.apache.ignite.configuration.MemoryConfiguration;
  import org.apache.ignite.internal.GridKernalContext;
  import org.apache.ignite.internal.IgniteInternalFuture;


Mime
View raw message