Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-496

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

Branch: refs/heads/ignite-496
Commit: 987cf05b659d38661b6ea9e57e8bfabd02e98c3e
Parents: c4f6e75 3fe4a98
Author: sboikov <semen.boi...@inria.fr>
Authored: Tue Mar 17 21:00:09 2015 +0300
Committer: sboikov <semen.boi...@inria.fr>
Committed: Tue Mar 17 21:00:09 2015 +0300

----------------------------------------------------------------------
 modules/core/pom.xml                            | 105 ++++++++++++
 .../cache/affinity/CacheAffinityKeyMapped.java  |  12 +-
 .../ignite/internal/GridKernalContextImpl.java  |   7 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   7 +
 .../apache/ignite/internal/IgniteKernal.java    |   3 +-
 .../internal/managers/GridManagerAdapter.java   |   6 -
 .../IgniteCacheObjectProcessorImpl.java         |  83 ++++++----
 .../apache/ignite/internal/util/GridTimer.java  |   2 +-
 .../internal/util/IgniteExceptionRegistry.java  | 164 +++++++++----------
 .../internal/util/io/GridFilenameUtils.java     |   1 -
 .../apache/ignite/internal/visor/VisorJob.java  |   3 +
 .../internal/visor/VisorMultiNodeTask.java      |   1 +
 .../compute/VisorComputeMonitoringHolder.java   |  10 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   6 +-
 .../node/VisorNodeDataCollectorJobResult.java   |  17 ++
 .../visor/node/VisorNodeDataCollectorTask.java  |   2 +
 .../node/VisorNodeDataCollectorTaskResult.java  |  10 ++
 .../node/VisorNodeSuppressedErrorsTask.java     |  99 +++++++++++
 .../internal/visor/query/VisorQueryTask.java    |   4 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   7 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   8 -
 .../resources/META-INF/classnames.properties    |  44 ++---
 modules/core/src/test/java/ExcludeList          |   4 +
 .../util/IgniteExceptionRegistrySelfTest.java   |  51 ++++--
 .../testframework/GridSpiTestContext.java       |   5 -
 .../junits/GridTestKernalContext.java           |   2 -
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   5 +
 27 files changed, 458 insertions(+), 210 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/987cf05b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/987cf05b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

Reply via email to