remove CPU checking
remove CPU checking
remove CPU checking
remove CPU checking
remove CPU checking
remove CPU checking
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner

Conflicts:
	properties/benchmarks/ycsb.properties
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner

Conflicts:
	src/frontend/org/qcri/PartitioningPlanner/Controller.java
 all
 all
 all
 all
Revert to old Becca's code
BinPacking on
Revert to Becca's new version
changed glpk library to be a symbolic link
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner

Merge with Becca's recent code 14 Jan
adding a space
Merge branch 'partitioning-planner' of https://github.com/rytaft/h-store into partitioning-planner
adding a space