You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/18 09:36:16 UTC
[06/14] ignite git commit: Merge remote-tracking branch
'remotes/apache-main/ignite-cont-merge' into ignite-1.5
Merge remote-tracking branch 'remotes/apache-main/ignite-cont-merge' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b382062e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b382062e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b382062e
Branch: refs/heads/master
Commit: b382062e02d7e3effca38d5181c47c76c16e24aa
Parents: d54fcbe db221f5
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Nov 17 16:36:48 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Nov 17 16:36:48 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 9 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +-
.../ignite/util/mbeans/GridMBeanSelfTest.java | 33 ++++-
.../GridSpringResourceInjectionSelfTest.java | 143 +++++++++++++++++++
.../processors/resource/spring-resource.xml | 27 ++++
.../testsuites/IgniteResourceSelfTestSuite.java | 2 +
6 files changed, 209 insertions(+), 13 deletions(-)
----------------------------------------------------------------------