Created
June 14, 2013 16:00
-
-
Save trast/5783048 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit f3b22299a6ca831f1534ceb6660e0c737dac4d46 | |
| suspicious merge in files: | |
| modified in both, took ^1 .travis.yml | |
| modified in both, took ^1 README.md | |
| modified in both, took ^1 src/main/scala/com/romix/akka/serialization/kryo/NoneSerializer.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/DataFlowVertex.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/DataGraphVertex.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/ExecutionConfiguration.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/ExecutionInformation.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/Graph.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/GraphEditor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/ProcessingVertex.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/Vertex.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/console/ConsoleServer.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/examples/EfficientSssp.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/examples/GraphSplitter.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/examples/PageRank.scala | |
| modified in ^1, took ^2 src/main/scala/com/signalcollect/examples/Ranker.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/examples/Sudoku.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/factory/messagebus/AkkaMessageBusFactory.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/factory/worker/Akka.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/interfaces/Factory.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/interfaces/Messages.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/interfaces/NodeActor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/interfaces/Worker.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/interfaces/WorkerActor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/interfaces/WorkerApi.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/messaging/AkkaProxy.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/messaging/BulkMessageBus.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/messaging/DefaultMessageBus.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/messaging/ParallelBulkMessageBus.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/Node.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/NodeProvisioner.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/local/LocalNode.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/local/LocalNodeProvisioner.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/ExecutionHost.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/Job.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/JobExecutor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/LocalHost.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/LocalJobSubmitter.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/NodeControllerActor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/NodeProvisionerActor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/TorqueHost.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/nodeprovisioning/torque/TorqueJob.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/worker/ThrottlingBulkScheduler.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/worker/WorkerGraphEditor.scala | |
| modified in both, took ^1 src/main/scala/com/signalcollect/worker/WorkerOperationCounters.scala | |
| modified in both, took ^1 src/test/scala/com/signalcollect/AkkaProxySpec.scala | |
| modified in both, took ^1 src/test/scala/com/signalcollect/GraphResetSpec.scala | |
| modified in both, took ^1 src/test/scala/com/signalcollect/features/ComputationTerminationSpec.scala | |
| modified in both, took ^1 src/test/scala/com/signalcollect/storage/VertexMapSpec.scala | |
| commit b611fd0b71b30d5d44cd7f92bc92c36fe3e547cc | |
| suspicious merge in files: | |
| modified in both, took ^2 src/main/scala/com/signalcollect/configuration/AkkaConfig.scala | |
| commit 457b249f4efdfb657b3f4dc538539a472c144954 | |
| suspicious merge in files: | |
| modified in both, took ^1 web-data/main.js | |
| commit f814d4986e3544df69f55845dbddaaeba738234c | |
| suspicious merge in files: | |
| modified in both, took ^1 src/test/scala/com/signalcollect/examples/VertexColoring.scala | |
| commit 9a89a17df7edb90f5e4d5949680f011cc9371566 | |
| suspicious merge in files: | |
| modified in both, took ^1 src/test/scala/com/signalcollect/examples/ChineseWhispersClustering.scala | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment