Merge branch 'ignite-sprint-4' into ignite-gg-9702
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e66664ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e66664ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e66664ae Branch: refs/heads/ignite-gg-9702 Commit: e66664aefcf64b5c5d547908d63b27a3bf800b46 Parents: a4c34f9 86cc1ad Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Apr 23 09:59:59 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Apr 23 09:59:59 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 107 +++++++++++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../cache/GridCacheAffinityManager.java | 12 --- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++++ ...acheSortedEvictionPolicyPerformanceTest.java | 13 ++- .../IgniteCacheFailoverTestSuite.java | 3 +- pom.xml | 14 +-- 15 files changed, 173 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
