Merge branch 'master' into simple

yushiyin · Apr 21, 2015 · 0fc385f · 0fc385f
2 parents 53e73df + 2b39b6b
commit 0fc385f
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 30 deletions.
diff --git a/README.md b/README.md
diff --git a/docker/bin/lib/spark-1.0-driver.jar → ...er/bin/lib/spark-1.1.1-RELEASE-driver.jar b/docker/bin/lib/spark-1.0-driver.jar → ...er/bin/lib/spark-1.1.1-RELEASE-driver.jar
diff --git a/src/extension/pom.xml b/src/extension/pom.xml
diff --git a/src/extension/src/main/java/config/ConfigurationLoader.java b/src/extension/src/main/java/config/ConfigurationLoader.java
diff --git a/src/extension/src/main/java/translation/ParallelBatchTransaction.java b/src/extension/src/main/java/translation/ParallelBatchTransaction.java
diff --git a/src/extension/src/main/java/translation/Writer.java b/src/extension/src/main/java/translation/Writer.java
diff --git a/src/extension/src/test/java/translation/WriterTest.java b/src/extension/src/test/java/translation/WriterTest.java
diff --git a/src/spark/pom.xml b/src/spark/pom.xml
diff --git a/src/spark/src/main/java/org/mazerunner/core/config/ConfigurationLoader.java b/src/spark/src/main/java/org/mazerunner/core/config/ConfigurationLoader.java
diff --git a/src/spark/src/main/java/org/mazerunner/core/messaging/Worker.java b/src/spark/src/main/java/org/mazerunner/core/messaging/Worker.java
diff --git a/src/spark/src/test/java/org/mazerunner/core/processor/GraphProcessorTest.java b/src/spark/src/test/java/org/mazerunner/core/processor/GraphProcessorTest.java