Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b218e78a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b218e78a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b218e78a Branch: refs/heads/ignite-709_2 Commit: b218e78adb72d759e646a1042f44fa19b44cf09e Parents: 5de74fe 54f9492 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue May 5 11:17:56 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue May 5 11:17:56 2015 -0700 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 ++++ .../streaming/wordcount/CacheConfig.java | 5 - .../config/grid-client-config.properties | 50 ++-- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 ++++--- .../client/GridClientConfiguration.java | 2 +- .../managers/communication/GridIoManager.java | 8 +- .../processors/cache/GridCacheTtlManager.java | 168 +++++++++----- .../processors/cache/GridCacheUtils.java | 5 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../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 | 227 ++++++++++++++++--- 23 files changed, 625 insertions(+), 340 deletions(-) ----------------------------------------------------------------------
