ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [48/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5009
Date Fri, 05 May 2017 09:45:59 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/658aadc5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/658aadc5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/658aadc5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 5be7e07,3ff1bff..6186352
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@@ -1010,10 -1006,10 +1006,10 @@@ public abstract class IgniteCacheExpiry
       * @throws Exception If failed.
       */
      public void testNearExpiresOnClient() throws Exception {
-         if(cacheMode() != PARTITIONED)
+         if (cacheMode() != PARTITIONED)
              return;
  
-         factory =  CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, 2));
 -        factory = CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, 1));
++        factory =  CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS,2));
  
          nearCache = true;
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/658aadc5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------


Mime
View raw message