Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/debdc2be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/debdc2be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/debdc2be Branch: refs/heads/ignite-460 Commit: debdc2beb84ca2a525fddad18094afc12a39be26 Parents: cf6e435 bd3a572 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Apr 27 18:45:21 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Apr 27 18:45:21 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 44 ++++ .../org/apache/ignite/internal/IgnitionEx.java | 165 +++++++++++++- .../util/spring/IgniteSpringHelper.java | 54 ++++- .../util/spring/IgniteSpringHelperImpl.java | 217 +++++++++++++++---- .../IgniteStartFromStreamConfigurationTest.java | 50 +++++ .../testsuites/IgniteSpringTestSuite.java | 2 + 6 files changed, 487 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
