Merge branch 'master' into ignite-2523-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e2d6fb6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e2d6fb6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e2d6fb6 Branch: refs/heads/ignite-2523-1 Commit: 1e2d6fb6a534335e0f786042c250b5734266b636 Parents: 0f282b2 97cf2b3 Author: vozerov-gridgain <[email protected]> Authored: Mon Apr 25 16:51:10 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Apr 25 16:51:10 2016 +0300 ---------------------------------------------------------------------- examples/config/filesystem/example-igfs.xml | 3 -- .../apache/ignite/internal/IgniteKernal.java | 31 ++++++++++++++++++-- modules/core/src/test/config/igfs-loopback.xml | 7 ----- modules/core/src/test/config/igfs-shmem.xml | 7 ----- 4 files changed, 28 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
