Merge remote-tracking branch 'origin/ignite-32' into ignite-32

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7cfdb63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7cfdb63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7cfdb63

Branch: refs/heads/sprint-1
Commit: a7cfdb63b10dfa59fcee50b2084fd92206f0ca29
Parents: 355a55b 707aaf5
Author: anovikov <anovi...@gridgain.com>
Authored: Mon Feb 2 21:54:28 2015 +0700
Committer: anovikov <anovi...@gridgain.com>
Committed: Mon Feb 2 21:54:28 2015 +0700

----------------------------------------------------------------------
 .../ignite/cache/store/jdbc/JdbcCacheStore.java |  14 +-
 .../configuration/IgniteConfiguration.java      |  22 ---
 .../ignite/internal/GridKernalContext.java      |   8 -
 .../ignite/internal/GridKernalContextImpl.java  |  12 --
 .../org/apache/ignite/internal/IgniteEx.java    |   8 -
 .../apache/ignite/internal/IgniteKernal.java    |   7 -
 .../org/apache/ignite/internal/IgnitionEx.java  |   1 -
 .../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/GridCacheStoreManager.java |  25 ++-
 .../processors/cache/GridCacheSwapManager.java  |   3 +-
 .../cache/GridCacheWriteBehindStore.java        |  21 +--
 .../preloader/GridDhtPartitionDemandPool.java   |   2 +-
 .../processors/interop/GridInteropAware.java    |  49 ------
 .../interop/GridInteropProcessor.java           |  82 ----------
 .../interop/GridInteropProcessorAdapter.java    |  31 ----
 .../processors/interop/GridInteropTarget.java   | 109 -------------
 .../interop/os/GridOsInteropProcessor.java      |  80 ---------
 .../internal/processors/interop/os/package.html |  23 ---
 .../internal/processors/interop/package.html    |  23 ---
 .../plugin/IgnitePluginProcessor.java           |  10 +-
 .../streamer/GridStreamProcessor.java           |   5 +-
 .../processors/streamer/IgniteStreamerEx.java   |   3 +-
 .../processors/streamer/IgniteStreamerImpl.java |   5 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |  10 +-
 .../hadoop/GridHadoopCommandLineTest.java       |   4 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |   6 -
 31 files changed, 151 insertions(+), 609 deletions(-)
----------------------------------------------------------------------


Reply via email to