Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b40d8a5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b40d8a5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b40d8a5e Branch: refs/heads/ignite-1058 Commit: b40d8a5e7d22142ee2e0b1b12507fba7f5607e02 Parents: c86f8f9 01d842a Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Fri Jun 26 13:19:56 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Fri Jun 26 13:19:56 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridDiscoveryEventSelfTest.java | 12 +++++------- scripts/git-patch-prop.sh | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
