Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fc2b256 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fc2b256 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fc2b256 Branch: refs/heads/sprint-1 Commit: 4fc2b2565355261d2d2f47d3dac6a4052877baf9 Parents: 16a04a0 7d86acb Author: ivasilinets <[email protected]> Authored: Thu Feb 5 13:43:09 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Feb 5 13:43:09 2015 +0300 ---------------------------------------------------------------------- .../ignite/configuration/IgniteConfiguration.java | 12 ++++++------ .../java/org/apache/ignite/internal/IgniteKernal.java | 10 +++++----- .../java/org/apache/ignite/internal/IgnitionEx.java | 4 ++-- .../internal/visor/node/VisorBasicConfiguration.java | 2 +- .../java/org/apache/ignite/mxbean/IgniteMXBean.java | 2 +- .../java/org/apache/ignite/spi/IgniteSpiAdapter.java | 4 ++-- .../org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +- .../apache/ignite/internal/GridHomePathSelfTest.java | 4 ++-- .../org/apache/ignite/testframework/GridTestUtils.java | 6 +++--- .../ignite/testframework/junits/GridAbstractTest.java | 2 +- .../apache/ignite/testframework/junits/IgniteMock.java | 2 +- .../resource/GridResourceProcessorSelfTest.java | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
