ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884
Date Thu, 28 Apr 2016 13:07:03 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-db-x-10884 5083e05cd -> 3f67466c9


Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java


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

Branch: refs/heads/ignite-db-x-10884
Commit: 3f67466c9449ac368032d5b48491db56344b54f6
Parents: 5083e05
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 28 16:07:01 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 28 16:07:01 2016 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3f67466c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 241d3ac..0e206f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -703,7 +703,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
                 if (updateSeq)
                     this.updateSeq.incrementAndGet();
 
-                create = true;
+                created = true;
 
                 if (log.isDebugEnabled())
                     log.debug("Created local partition: " + loc);


Mime
View raw message