ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [8/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Date Fri, 18 Dec 2015 11:14:38 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java


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

Branch: refs/heads/ignite-1537
Commit: 527aa2adf51b7d4aa60013e8ae6b2b48c550863b
Parents: 9ed3909 24eccb8
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 18 14:13:41 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 18 14:13:41 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/binary/BinaryClassDescriptor.java   | 5 ++++-
 .../org/apache/ignite/internal/binary/BinaryWriteMode.java     | 3 +++
 .../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 6 ++++--
 .../cache/IgniteCacheBinaryEntryProcessorSelfTest.java         | 4 ++--
 .../distributed/CacheGetInsideLockChangingTopologyTest.java    | 2 ++
 .../internal/processors/query/IgniteSqlSplitterSelfTest.java   | 3 ++-
 6 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/527aa2ad/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index ed38d2b,5234d6e..5456700
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@@ -73,7 -73,9 +73,10 @@@ import org.apache.ignite.transactions.T
  import org.apache.ignite.transactions.TransactionConcurrency;
  
  import static java.util.concurrent.TimeUnit.MILLISECONDS;
+ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
 +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
  import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
  import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
  import static org.apache.ignite.cache.CacheMode.PARTITIONED;


Mime
View raw message