Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63944d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63944d41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63944d41 Branch: refs/heads/ignite-946 Commit: 63944d41d9bb7e9e74366f935b9f620e01bc36ce Parents: 56efb6b b94c130 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Aug 6 15:54:01 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Aug 6 15:54:01 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 5 + .../config/benchmark-multicast.properties | 1 + parent/pom.xml | 97 ++++++++++---------- 3 files changed, 54 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
