You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/05/13 19:21:14 UTC
[42/50] [abbrv] ignite git commit: Merge branches 'ignite-1.6' and
'master' of https://git-wip-us.apache.org/repos/asf/ignite
Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc9d6a58
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc9d6a58
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc9d6a58
Branch: refs/heads/ignite-2949
Commit: cc9d6a58c700a17f2f746d22c8f27fd5d100e4c0
Parents: aede4b3 06ba3fe
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri May 13 16:58:36 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri May 13 16:58:36 2016 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 4 +-
.../internal/managers/GridManagerAdapter.java | 21 ++-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 29 +++-
.../org/apache/ignite/IgniteSpringBean.java | 143 ++++++++++++-------
.../ignite/internal/GridFactorySelfTest.java | 27 +++-
.../ignite/internal/IgniteSpringBeanTest.java | 55 +++++++
.../testsuites/IgniteSpringTestSuite.java | 2 +
7 files changed, 225 insertions(+), 56 deletions(-)
----------------------------------------------------------------------