Merge pull request #1 from apache/master Merging Hama latest code into my cloned repo
Project: http://git-wip-us.apache.org/repos/asf/hama/repo Commit: http://git-wip-us.apache.org/repos/asf/hama/commit/81e21e00 Tree: http://git-wip-us.apache.org/repos/asf/hama/tree/81e21e00 Diff: http://git-wip-us.apache.org/repos/asf/hama/diff/81e21e00 Branch: refs/heads/master Commit: 81e21e00c759a4191f5d3761c4771073d34cafa1 Parents: c709c0a 4b3ecba Author: Behroz Sikander <[email protected]> Authored: Wed Apr 27 22:25:42 2016 +0200 Committer: Behroz Sikander <[email protected]> Committed: Wed Apr 27 22:25:42 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 19 ++- README.md | 2 +- c++/pom.xml | 4 +- commons/pom.xml | 4 +- core/pom.xml | 4 +- .../main/java/org/apache/hama/Constants.java | 2 + .../main/java/org/apache/hama/bsp/BSPJob.java | 5 + .../java/org/apache/hama/bsp/BSPJobClient.java | 21 ++- .../java/org/apache/hama/bsp/RunningJob.java | 2 + .../taskallocation/RoundRobinTaskAllocator.java | 146 +++++++++++++++++++ .../java/org/apache/hama/ipc/AsyncClient.java | 49 +++---- .../java/org/apache/hama/ipc/AsyncServer.java | 13 +- .../apache/hama/bsp/TestAdditionalTasks.java | 105 +++++++++++++ .../hama/bsp/TestTaskAllocationRoundRobin.java | 128 ++++++++++++++++ dist/pom.xml | 2 +- examples/pom.xml | 4 +- .../CustomVertexReadWriteStateTest.java | 70 +++++++++ .../java/org/apache/hama/examples/SSSPTest.java | 54 ++++++- graph/pom.xml | 4 +- .../main/java/org/apache/hama/graph/Vertex.java | 26 +++- mesos/pom.xml | 2 +- ml/pom.xml | 4 +- pom.xml | 15 +- src/site/xdoc/index.xml | 4 +- src/site/xdoc/team-list.xml | 6 + yarn/pom.xml | 4 +- .../org/apache/hama/bsp/YARNBSPJobClient.java | 6 + 27 files changed, 632 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
