Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-732
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49a2f73c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49a2f73c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49a2f73c Branch: refs/heads/ignite-732 Commit: 49a2f73cdb1bff6d8d5a9f246a07a528c07bb5c4 Parents: 62ff492 0885ac0 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 30 18:14:03 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 30 18:14:03 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 +++++ .../processors/cache/GridCacheTtlManager.java | 168 +++++++++------ .../processors/cache/GridCacheUtils.java | 5 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 ++++++++++++++ ...GridCacheLoadingConcurrentGridStartTest.java | 154 -------------- .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/schema-import/pom.xml | 6 +- pom.xml | 212 ++++++++++++++++--- 15 files changed, 518 insertions(+), 265 deletions(-) ----------------------------------------------------------------------
