Merge branch 'split-planner' of ssh://github.com/marcoserafini/h-store into split-planner
Merge branch 'master' of https://github.com/apavlo/h-store into split-planner
small fixes to load.sh
Merge remote branch 'becca/split-planner' into split-planner
Merge branch 'split-planner' of ssh://github.com/marcoserafini/h-store into split-planner
suppressed error messages from perl when getting cpu util data
some fixes of the controller
Merge branch 'split-planner' of ssh://github.com/marcoserafini/h-store into split-planner
Merge remote-tracking branch 'andy/master' into split-planner
merged with Becca
merged with becca/split-planner
Merged snapshot-related classes from jarulraj/master. It compiles now but it is not fully tested.

ours (marcoserafini/split-planner)
M       src/frontend/org/voltdb/sysprocs/AdHoc.java
M       src/frontend/org/voltdb/sysprocs/Statistics.java

theirs (jarulraj/main)
M       src/frontend/org/voltdb/sysprocs/SnapshotDelete.java
M       src/frontend/org/voltdb/sysprocs/SnapshotRegistry.java
M       src/frontend/org/voltdb/sysprocs/SnapshotRestore.java
M       src/frontend/org/voltdb/sysprocs/SnapshotSave.java
M       src/frontend/org/voltdb/sysprocs/SnapshotScan.java
M       src/frontend/org/voltdb/sysprocs/SnapshotStatus.java
M       src/frontend/org/voltdb/sysprocs/saverestore/ClusterSaveFileState.java
M       src/frontend/org/voltdb/sysprocs/saverestore/PartitionedTableSaveFileState.java
M       src/frontend/org/voltdb/sysprocs/saverestore/ReplicatedTableSaveFileState.java
M       src/frontend/org/voltdb/sysprocs/saverestore/SnapshotUtil.java
M       src/frontend/org/voltdb/sysprocs/saverestore/TableSaveFile.java
M       src/frontend/org/voltdb/sysprocs/saverestore/TableSaveFileState.java

merged
M       src/frontend/org/voltdb/sysprocs/SysProcFragmentId.java
M	src/frontend/org/voltdb/VoltProcedure.java
M	src/frontend/org/voltdb/compiler/VoltProjectBuilder.java
M	src/frontend/org/voltdb/jni/ExecutionEngine.java

added (from jarulraj/main)
A       src/frontend/org/voltdb/sysprocs/saverestore/MatView.java
A       src/frontend/org/voltdb/sysprocs/saverestore/SaveRestoreSelect.java
A       src/frontend/org/voltdb/sysprocs/saverestore/SaveRestoreTestProjectBuilder.java
A       src/frontend/org/voltdb/sysprocs/saverestore/saverestore-altered-ddl.sql
A       src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl-partitioned.sql
A       src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl-replicated.sql
A       src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl.sql
minor fixes
added new testing files from the snapshotting branch
fixed solved some problems with the TPCC regression test
TPCC loading unit test without WAL recovery passes successfully
disabled the assertion that did not make me restore the snapshot
made runOnce method public to enable TestYCSBLogicalRecovery
integrated snapshotting and fixed conflicts