Merge branch 'master' into perf_regression

Author: apavlo

Jenkinsfile

@@ -22,6 +22,7 @@ pipeline {
                         sh 'cd build && make benchmark -j4'
                         sh 'cd build && make install'
                         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                        sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         sh 'cd build && python ../script/validators/jdbc_validator.py'
                     }
                 }
@@ -48,6 +49,7 @@ pipeline {
                         // sh 'cd build && make benchmark -j4'
                         // sh 'cd build && make install'
                         // sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                        // sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         // sh 'cd build && python ../script/validators/jdbc_validator.py'
                     }
                 }
@@ -64,6 +66,7 @@ pipeline {
                         sh 'cd build && make benchmark -j4'
                         sh 'cd build && make install'
                         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                        sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                         sh 'cd build && python ../script/validators/jdbc_validator.py'
                     }
                 }
@@ -79,6 +82,7 @@ pipeline {
                 //         sh 'cd build && make benchmark -j4'
                 //         sh 'cd build && make install'
                 //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                //         sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
                 //         sh 'cd build && python ../script/validators/jdbc_validator.py'
                 //     }
                 // }

script/git-hooks/pre-commit

@@ -19,7 +19,7 @@ if [ -n "$FILES" ]; then
     echo "******* Peloton Pre-Commit Hook *******"
     echo "***************************************"
     echo "Use \"$FORMATTER_PATH -c -f\" to format all staged files."
-    echo "Or use \"$FORMATTER_PATH --no-verify\" to temporarily bypass the pre-commit hook."
+    echo "Or use \"git commit --no-verify\" to temporarily bypass the pre-commit hook."
     echo
     echo "Be aware that changed files have to be staged again!"
     echo "***************************************"