Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0aba0836 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0aba0836 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0aba0836 Branch: refs/heads/ignite-32 Commit: 0aba08368df0b9363e7e744db082ea5223791736 Parents: e81ad84 725d79f Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jan 16 05:39:30 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jan 16 05:39:30 2015 +0700 ---------------------------------------------------------------------- .../test/java/org/gridgain/grid/p2p/p2p.properties | 17 ----------------- 1 file changed, 17 deletions(-) ----------------------------------------------------------------------
