Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-release-test-no-mod
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8759f8b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8759f8b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8759f8b6 Branch: refs/heads/ignite-release-test-no-mod Commit: 8759f8b6507829c83d172286b3c992888e4f5903 Parents: aad1fe4 5a2d62e Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Thu Mar 5 23:08:58 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Thu Mar 5 23:08:58 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContext.java | 30 ++ .../ignite/internal/GridKernalContextImpl.java | 23 ++ .../ignite/internal/GridUpdateNotifier.java | 16 +- .../apache/ignite/internal/IgniteKernal.java | 275 +++++++++---------- .../org/apache/ignite/internal/SkipDaemon.java | 29 ++ .../ignite/internal/managers/GridManager.java | 20 +- .../internal/managers/GridManagerAdapter.java | 73 ++--- .../checkpoint/GridCheckpointManager.java | 4 +- .../collision/GridCollisionManager.java | 4 +- .../discovery/GridDiscoveryManager.java | 38 ++- .../managers/indexing/GridIndexingManager.java | 4 +- .../swapspace/GridSwapSpaceManager.java | 4 +- .../internal/processors/GridProcessor.java | 11 +- .../processors/GridProcessorAdapter.java | 5 - .../processors/cache/GridCacheProcessor.java | 56 ++-- .../distributed/near/GridNearCacheAdapter.java | 8 + .../clock/GridClockSyncProcessor.java | 9 +- .../internal/processors/igfs/IgfsProcessor.java | 102 ++++--- .../processors/job/GridJobProcessor.java | 1 + .../processors/rest/GridRestProcessor.java | 64 ++--- .../streamer/GridStreamProcessor.java | 31 +-- .../apache/ignite/plugin/PluginProvider.java | 3 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 20 +- .../ignite/spi/IgniteSpiConsistencyChecked.java | 7 - .../internal/GridDiscoveryEventSelfTest.java | 44 --- .../cache/GridCacheConcurrentMapTest.java | 4 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 - .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 11 +- 29 files changed, 435 insertions(+), 466 deletions(-) ----------------------------------------------------------------------
