Merge branch 'master' of github.com:apavlo/h-store
Toggled off anticache_enable to fix runtime linking errors in default mode
(ant build + ant hstore-prepare + ant hstore-benchmark with no runtime flags)
Fix in ProcedureStatistics.fromJSONObject() to have it just display a warning instead dying... This fix is for Nesime
Disabled MR* queries from TPC-C
Fixed the ConflictSetCalculator for tables with no primary key. This is for @hawkwang
Fixed @AdHoc so that it will enable the ReadWriteTracker if 'site.exec_readwrite_tracking' is enabled
New test case for PersistentTable to check whether the TupleIds are getting set #146
Removed TableTuple::getTupleId(). Everything should be using Table::getTupleId(). Fixed ReadWriteTracker and the appropriate executors. #146
Fixed memory leak in PersistentTableLogTest::TupleIds #146
Added new 'skew_factor' option to YCSB instead of always using hardcoded value. Cleaned up YCSBClient so that it uses the correct number of records in its calculation
Merge branch 'storage_mmap'
Merge + Runs fine with STORAGE_MMAP (Data + Pool Support)
Merge branch 'master' of github.com:jarulraj/h-store

Conflicts:
	buildtools.py
	src/frontend/edu/brown/hstore/conf/HStoreConf.java
Disable MMAP sync for now
Not using MMAP Pool in persistentTable::copyForPersistentUpdate
Adding ycsb script
Merge with master
Merge with master
Merge branch 'master' of github.com:jarulraj/h-store into storage_mmap
Merge branch 'storage_mmap' of github.com:jarulraj/h-store into storage_mmap

Conflicts:
	src/ee/common/MMAPMemoryManager.cpp