Merge remote-tracking branch 'origin/sprint-2' into sprint-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/3bf90ab1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bf90ab1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bf90ab1 Branch: refs/heads/ignite-224 Commit: 3bf90ab18495d25dc380251a6bf8390b3696f004 Parents: 69e2a7d 7e19e2e Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Feb 17 15:09:46 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Feb 17 15:09:46 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 22 +--- .../continuous/CacheContinuousQueryManager.java | 16 ++- .../dataload/IgniteDataLoaderImpl.java | 14 ++- .../visor/cache/VisorCacheLoadTask.java | 35 +++--- .../IgniteCacheEntryListenerAbstractTest.java | 106 +++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 9 +- 7 files changed, 154 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
