Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-334
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5776850 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5776850 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5776850 Branch: refs/heads/ignite-51 Commit: c577685022f9b59342acd2335efeb9149e81049d Parents: 4df7c85 b2675bc Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Mar 2 18:12:06 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Mar 2 18:12:06 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 2 +- .../java/org/apache/ignite/IgniteCluster.java | 8 +- .../configuration/IgniteConfiguration.java | 5 +- .../ignite/internal/GridKernalContext.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../org/apache/ignite/internal/IgnitionEx.java | 592 +++++++++---------- .../affinity/GridAffinityAssignmentCache.java | 13 +- .../processors/cache/CacheMetricsImpl.java | 4 + .../processors/cache/GridCacheContext.java | 19 + .../processors/cache/GridCacheMapEntry.java | 9 + .../processors/cache/GridCacheProcessor.java | 15 + .../processors/cache/GridCacheStoreManager.java | 12 +- .../GridDistributedCacheAdapter.java | 2 + .../distributed/dht/GridDhtCacheEntry.java | 3 + .../distributed/dht/GridDhtLocalPartition.java | 5 + .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../cache/transactions/IgniteTxManager.java | 7 +- .../processors/cluster/ClusterProcessor.java | 46 ++ .../dataload/IgniteDataLoaderImpl.java | 29 +- .../core/src/main/resources/ignite.properties | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java | 440 ++++++++++++++ .../cache/GridCacheAbstractMetricsSelfTest.java | 42 ++ ...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++++++ ...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 ++ .../GridCachePartitionedLocalStoreSelfTest.java | 51 ++ ...chePartitionedOffHeapLocalStoreSelfTest.java | 56 ++ .../GridCacheReplicatedLocalStoreSelfTest.java | 51 ++ ...heReplicatedUsersAffinityMapperSelfTest.java | 45 ++ ...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 ++ .../GridCacheTxUsersAffinityMapperSelfTest.java | 45 ++ .../GridCacheQueueCleanupSelfTest.java | 1 - .../IgniteCacheExpiryPolicyAbstractTest.java | 38 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + modules/scalar/pom.xml | 6 + pom.xml | 4 +- 37 files changed, 1503 insertions(+), 407 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5776850/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ----------------------------------------------------------------------
