Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1142
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4b3ec58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4b3ec58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4b3ec58 Branch: refs/heads/ignite-1142 Commit: d4b3ec58d223fbf35e9a8200ceb4dab8d657807b Parents: fec11d6 d0a6f55 Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Aug 3 16:46:56 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Aug 3 16:46:56 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 17 +------- .../processors/cache/GridCacheProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 16 ++++++++ .../src/test/java/config/ignite-test-config.xml | 43 ++++++++++++++++++++ .../ignite/internal/GridFactorySelfTest.java | 9 ++++ 5 files changed, 70 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
