Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cbe46e12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cbe46e12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cbe46e12 Branch: refs/heads/ignite-42 Commit: cbe46e12946995d46e710e660efc49f953cd1903 Parents: 5faab66 0f8d9ea Author: sboikov <[email protected]> Authored: Wed Jan 14 15:23:49 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Jan 14 15:23:49 2015 +0300 ---------------------------------------------------------------------- .../services/javax.cache.spi.CachingProvider | 1 + .../org/apache/ignite/IgniteCacheMXBean.java | 72 ++++ .../org/apache/ignite/IgniteCacheManager.java | 372 +++++++++++++++++++ .../apache/ignite/IgniteCachingProvider.java | 189 ++++++++++ .../processors/cache/IgniteCacheProxy.java | 59 ++- .../grid/cache/GridCacheConfiguration.java | 11 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 3 +- .../org/gridgain/grid/kernal/GridGainEx.java | 2 +- .../processors/cache/CacheInvokeEntry.java | 3 + .../processors/cache/GridCacheEntryImpl.java | 8 + .../cache/GridCacheEvictionEntry.java | 8 + .../cache/GridCacheFilterEvaluationEntry.java | 8 + .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/dr/GridCacheDrManager.java | 2 +- .../cache/dr/os/GridOsCacheDrManager.java | 2 +- .../cache/query/GridCacheQueryManager.java | 8 + .../GridCacheContinuousQueryEntry.java | 8 + .../grid/kernal/tck/TCKMBeanServerBuilder.java | 118 ++++++ .../cache/IgniteCachingProviderSelfTest.java | 131 +++++++ .../dht/GridCacheAtomicNearCacheSelfTest.java | 1 + .../cache/eviction/GridCacheMockEntry.java | 8 + .../hadoop/jobtracker/GridHadoopJobTracker.java | 7 +- 22 files changed, 1003 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbe46e12/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java ----------------------------------------------------------------------
