Merge branches 'ignite-82' and 'sprint-1' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-82
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e5b052e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e5b052e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e5b052e Branch: refs/heads/ignite-191 Commit: 8e5b052ece9e967eb25f6385b89c0a9f3b069992 Parents: bbbd02b 0e55e6c Author: anovikov <anovi...@gridgain.com> Authored: Wed Feb 11 13:25:30 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Feb 11 13:25:30 2015 +0700 ---------------------------------------------------------------------- .../src/test/resources/spring-server-node.xml | 100 +++++++++-------- .../test/resources/spring-server-ssl-node.xml | 100 +++++++++-------- .../main/java/org/apache/ignite/Ignition.java | 6 -- .../configuration/IgniteConfiguration.java | 27 +---- .../apache/ignite/internal/IgniteKernal.java | 9 +- .../org/apache/ignite/internal/IgnitionEx.java | 1 - .../GridClientConnectionManagerAdapter.java | 2 +- .../router/impl/GridRouterClientImpl.java | 2 +- .../impl/GridTcpRouterNioListenerAdapter.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../visor/node/VisorBasicConfiguration.java | 18 ---- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 -- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 106 ------------------- .../marshaller/GridMarshallerAbstractTest.java | 2 +- .../marshaller/GridMarshallerResourceBean.java | 2 +- .../marshaller/GridMarshallerTestBean.java | 2 +- .../testsuites/IgniteKernalSelfTestSuite.java | 1 - .../config/VisorConfigurationCommand.scala | 13 +-- 18 files changed, 112 insertions(+), 293 deletions(-) ----------------------------------------------------------------------
