tree 09bf1d465c45285e0db5b4312baf9a9a836cc266
parent 3b22171376cee188fa7c574435578e5a36eb5e50
parent 92736c7db4f3c59ba1914da78af854be6d16f827
author zheilbron <zheilbron@gmail.com> 1376534316 -0700
committer zheilbron <zheilbron@gmail.com> 1376534316 -0700

Merge branch 'master' into dev/hyracks_msr

Conflicts:
	hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/job/JobRun.java
	hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/sort/FrameSorter.java
	hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java
	pregelix/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java
	pregelix/pregelix-example/src/main/java/edu/uci/ics/pregelix/example/io/VLongWritable.java
	pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/lib/io/SizeEstimationTest.java
	pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/function/ComputeUpdateFunctionFactory.java
	pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/simpleagg/AccumulatingAggregatorFactory.java