You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/17 11:50:06 UTC
[4/4] ignite git commit: Merge branch 'master' into ignite-1786
Merge branch 'master' into ignite-1786
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92918911
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92918911
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92918911
Branch: refs/heads/ignite-1786
Commit: 929189111dd2ee48fe1b3cf07ca11bb5642790d0
Parents: d208e44 d3420e6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Mar 17 13:49:55 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Mar 17 13:49:55 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../dht/preloader/GridDhtPartitionDemander.java | 29 ++--
.../internal/processors/igfs/IgfsFileMap.java | 9 +-
.../igfs/IgfsFragmentizerManager.java | 166 ++++++++++++++-----
.../igfs/IgfsInvalidRangeException.java | 4 +-
.../processors/igfs/IgfsMetaManager.java | 67 ++++----
.../ComputeJobCancelWithServiceSelfTest.java | 154 +++++++++++++++++
.../igfs/IgfsMetaManagerSelfTest.java | 11 --
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
9 files changed, 335 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/92918911/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index be3aee9,8df89f3..21fbc47
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -850,7 -849,7 +850,8 @@@ public class IgniteKernal implements Ig
startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx));
startProcessor(new GridCacheProcessor(ctx));
startProcessor(new GridQueryProcessor(ctx));
+ startProcessor(new OdbcProcessor(ctx));
+ startProcessor(new GridServiceProcessor(ctx));
startProcessor(new GridTaskSessionProcessor(ctx));
startProcessor(new GridJobProcessor(ctx));
startProcessor(new GridTaskProcessor(ctx));