Merge branches 'ignite-1015' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1015
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1eb0d79b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1eb0d79b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1eb0d79b Branch: refs/heads/ignite-752 Commit: 1eb0d79bd6c81e1f8e901de9b58600bc70883cd3 Parents: 2e1dea9 a57707f Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jul 22 17:53:38 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jul 22 17:53:38 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
