Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-834
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/086553ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/086553ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/086553ef Branch: refs/heads/ignite-834 Commit: 086553ef14a75a0665f1e1346a100e858c1f39a5 Parents: 1255e58 54f9492 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue May 5 12:04:22 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue May 5 12:04:22 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 +- modules/cloud/pom.xml | 4 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 +++-- .../configuration/CacheConfiguration.java | 259 +++++++++++--- .../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 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +-- .../cache/VisorCacheNearConfiguration.java | 4 +- .../visor/cache/VisorCacheStartTask.java | 155 +++++++++ .../internal/visor/util/VisorTaskUtils.java | 10 + .../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 +- .../resources/META-INF/classnames.properties | 13 + .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 13 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 +++++++++ ...GridCacheLoadingConcurrentGridStartTest.java | 154 --------- .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/gce/pom.xml | 4 +- modules/schema-import/pom.xml | 6 +- .../commands/cache/VisorCacheCommand.scala | 2 +- pom.xml | 230 +++++++++++-- 39 files changed, 1431 insertions(+), 585 deletions(-) ----------------------------------------------------------------------
