Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1556ec98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1556ec98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1556ec98 Branch: refs/heads/ignite-757 Commit: 1556ec98d937676455964948d5726ec1e871a320 Parents: 00f532c 8e31b7c Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Apr 23 01:13:48 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Apr 23 01:13:48 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 107 +++++++++++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../discovery/GridDiscoveryManager.java | 18 +++- .../IgniteCacheObjectProcessorImpl.java | 2 +- ...acheSortedEvictionPolicyPerformanceTest.java | 13 ++- pom.xml | 14 +-- 7 files changed, 143 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
