VOLTIMATE Stuff basically working.
VOLTIMATE Dropped unused JSON code.
VOLTIMATE Better table sizing based on documentation.
VOLTIMATE Polish the page.
VOLTIMATE Fix index calculation.
ENG-5769 Implement and test better JDBC reconnect logic.
ENG-5769 Fake checkin to trigger Jenkins.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5769-jdbc-disconnect-cleanup
ENG-5769 Fix JDBC unit tests by separating reconnect test.
Merge branch 'ENG-5769-jdbc-disconnect-cleanup' of github.com:VoltDB/voltdb into ENG-5769-jdbc-disconnect-cleanup
ENG-5769 Get rid of JDBC retry.
ENG-5769 More retry logic cleanup.
ENG-5769 Fix test for not automatically retrying.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5769-jdbc-disconnect-cleanup
ENG-5769 Address concurrency concerns.
ENG-5769 Fix concurrency (again) and fix unit test.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5769-jdbc-disconnect-cleanup
pick up the comparison optimization from innovation branch separately
Merge branch 'master' of github.com:VoltDB/voltdb into innovation-xin-perf-steps
Merge remote-tracking branch 'origin/master' into voltimate

Conflicts:
	src/frontend/org/voltdb/compiler/VoltCompiler.java
	src/frontend/org/voltdb/utils/CatalogUtil.java