ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [19/20] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-tc-jclient
Date Wed, 25 Mar 2015 11:56:52 GMT
Merge branch 'sprint-2' into ignite-tc-jclient


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

Branch: refs/heads/ignite-tc-jclient
Commit: 36172ce37267515176ed90c0f0ea6a2cabd5d61e
Parents: 1bb91e1 c620ee0
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Wed Mar 25 14:52:16 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Wed Mar 25 14:52:16 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/schema/CacheConfig.java   |   2 +-
 .../java/org/apache/ignite/schema/Demo.java     |  56 +++---
 .../java/org/apache/ignite/schema/DemoNode.java |  37 ++++
 .../JettyRestProcessorAbstractSelfTest.java     |   5 +
 .../ignite/cache/CacheDistributionMode.java     |  69 -------
 .../java/org/apache/ignite/cache/CacheMode.java |   3 +-
 .../cache/eviction/CacheEvictableEntry.java     |  96 +++++++++
 .../cache/eviction/CacheEvictionFilter.java     |   4 +-
 .../cache/eviction/CacheEvictionPolicy.java     |   6 +-
 .../ignite/cache/eviction/EvictableEntry.java   |  96 ---------
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |  14 +-
 .../CacheIgfsPerBlockLruEvictionPolicy.java     |  24 +--
 .../eviction/lru/CacheLruEvictionPolicy.java    |  16 +-
 .../random/CacheRandomEvictionPolicy.java       |   4 +-
 .../processors/cache/CacheDistributionMode.java |  67 +++++++
 .../cache/CacheEvictableEntryImpl.java          | 197 +++++++++++++++++++
 .../processors/cache/EvictableEntryImpl.java    | 197 -------------------
 .../processors/cache/GridCacheEntryEx.java      |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   6 +-
 .../processors/cache/GridCacheUtils.java        |   4 +-
 .../dht/GridClientPartitionTopology.java        |   4 +-
 .../distributed/near/GridNearCacheEntry.java    |  64 +++---
 .../resources/META-INF/classnames.properties    |   2 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java    |   2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   2 -
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   2 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |   1 -
 ...hePartitionedProjectionAffinitySelfTest.java |   1 -
 .../processors/cache/GridCacheTestEntryEx.java  |   3 +-
 .../IgniteCollectionAbstractTest.java           |   3 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |  17 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |   3 -
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |   1 -
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |   2 -
 .../near/GridCacheNearTxPreloadSelfTest.java    |   1 -
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   3 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   1 -
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |   4 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   4 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   4 +-
 .../GridCacheEvictionFilterSelfTest.java        |   2 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |   2 +-
 .../cache/eviction/GridCacheMockEntry.java      |   2 +-
 .../GridCacheFifoEvictionPolicySelfTest.java    |   2 +-
 .../lru/GridCacheLruEvictionPolicySelfTest.java |   2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   1 -
 .../IgniteCacheStoreSessionAbstractTest.java    |   6 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |   1 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   2 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |   3 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |   3 +-
 ...niteCachePartitionedFieldsQuerySelfTest.java |   1 -
 .../query/h2/sql/GridQueryParsingTest.java      |   2 -
 .../ignite/schema/generator/CodeGenerator.java  |   5 +-
 .../schema/test/model/ignite-type-metadata.xml  |  28 ---
 .../yardstick/IgniteAbstractBenchmark.java      |   2 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   1 +
 .../org/apache/ignite/yardstick/IgniteNode.java |   4 +-
 59 files changed, 553 insertions(+), 547 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36172ce3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 06ed2b1,dabb077..8526230
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@@ -49,8 -49,9 +49,13 @@@ abstract class JettyRestProcessorAbstra
          System.clearProperty(IGNITE_JETTY_PORT);
      }
  
 +    @Override protected void beforeTest() throws Exception {
 +        fail("See https://issues.apache.org/jira/browse/IGNITE-572");
++    }
++
+     /** {@inheritDoc} */
+     @Override protected void beforeTest() throws Exception {
+         fail("See https://issues.apache.org/jira/browse/IGNITE-572");
      }
  
      /** {@inheritDoc} */


Mime
View raw message