Merge remote-tracking branch 'remotes/origin/master' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a99afe3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a99afe3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a99afe3 Branch: refs/heads/ignite-929 Commit: 3a99afe35bd35194287d5cf8fea61e8962106040 Parents: 9f62174 546d595 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 9 14:28:10 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 9 14:28:10 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 ++ .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 32 +++--- .../processors/cache/GridCacheProcessor.java | 97 +++++------------ .../continuous/CacheContinuousQueryHandler.java | 4 +- .../datastructures/DataStructuresProcessor.java | 39 +++++-- .../GridCacheCountDownLatchImpl.java | 15 ++- ...cheStoreSessionListenerAbstractSelfTest.java | 1 - .../IgniteCacheConfigurationTemplateTest.java | 26 +---- .../cache/IgniteDynamicCacheStartSelfTest.java | 16 +-- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../IgniteClientDataStructuresAbstractTest.java | 109 ++++++++++++++----- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- modules/kafka/pom.xml | 11 -- .../util/spring/IgniteSpringHelperImpl.java | 10 +- .../IgniteExcludeInConfigurationTest.java | 5 +- .../org/apache/ignite/spring/sprint-exclude.xml | 19 ++++ .../visor/commands/open/VisorOpenCommand.scala | 2 +- 18 files changed, 229 insertions(+), 188 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a99afe3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a99afe3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a99afe3/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a99afe3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ----------------------------------------------------------------------
