VoltDB/voltdb — pull request #1783 by mikeismert (2014-11-10 19:01:00+00:00)
Title: Eng6884 review2

Don't merge, I'll squash it later.