Leave off parens in the explain output for NOW and CURRENT_TIMESTAMP functions
Merge branch 'master' into ddlroundtripfix
Skip hsql params left behind by mistake.
Test ENG-6861 param confusion
Make StatementDMQL compile.
forgot to git add
Merge branch 'ddlroundtripfix' into ENG-6861-ignore-ghost-params
Merge branch 'master' into ENG-6861-ignore-ghost-params
Add type resolution to 'IN ?' params, partly so they won't pass for unused ghost params.
Add pre-parser support for upsert adhoc
ENG-5540-changed current days value from 0 to 1
ENG-5540 added error message for --days=0 value
ENG-5540 reverted test case, made changes to create current day file
Merge branch 'master' into ENG-6948-upsert-preparser
make the order of keywords consistent
performance charts: set placement and size of legend for improved readability
Add upsert support for studio
Add more UPSERT test for sql command
Merge pull request #1687 from VoltDB/ENG-5540-daysOfLogFileToCollect

ENG-5540-changed current days value from 0 to 1
Add script to make vmware image from an older vmware image.