Merge remote-tracking branch 'remotes/origin/ignite-86' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88514f70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88514f70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88514f70 Branch: refs/heads/ingite-9655-merge Commit: 88514f70095e2b21415d24cec10ec79896d016d4 Parents: 7f50e80 258ee1c Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Feb 2 12:30:33 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Feb 2 12:30:33 2015 +0300 ---------------------------------------------------------------------- .../GridDeploymentPerLoaderStore.java | 20 ++- .../GridDeploymentPerVersionStore.java | 4 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheDeploymentManager.java | 161 +++++++++++-------- .../cache/GridCachePreloaderAdapter.java | 2 +- .../processors/cache/GridCacheProcessor.java | 5 +- .../processors/cache/GridCacheSwapManager.java | 3 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../streamer/GridStreamProcessor.java | 5 +- .../processors/streamer/IgniteStreamerEx.java | 3 +- .../processors/streamer/IgniteStreamerImpl.java | 5 +- 11 files changed, 113 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88514f70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88514f70/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88514f70/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java ----------------------------------------------------------------------
