Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbf7149d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbf7149d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbf7149d Branch: refs/heads/ignite-sprint-5 Commit: fbf7149d775472f9dc1e9cba9a0c10a6780688e6 Parents: 45199eb 54f9492 Author: sboikov <sboi...@gridgain.com> Authored: Tue May 5 09:56:03 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue May 5 09:56:03 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 4 +- 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 +++-- .../configuration/CacheConfiguration.java | 255 +++++++++++--- .../configuration/IgniteConfiguration.java | 344 +++++++++++++++---- .../ignite/internal/GridUpdateNotifier.java | 66 +++- .../apache/ignite/internal/IgniteKernal.java | 83 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../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 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../internal/GridUpdateNotifierSelfTest.java | 13 +- .../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 ++++++++++-- 30 files changed, 1225 insertions(+), 537 deletions(-) ----------------------------------------------------------------------
