From 4dfa91d6cb380d3dc0abc4c132a282d167d5ed48 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Thu, 2 Feb 2017 12:34:45 +0100
Subject: [PATCH] fixed syntax error in Vagrantfile

---
 CHANGELOG.md | 1 +
 Vagrantfile  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c870af..9ba1a7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - fixed syntax error in Vagrantfile (Nikolaus Krismer)
   - preparations to use libvirt on dbis-ci test system (Nikolaus Krismer)
   - preparations to use libvirt on dbis-ci test system (Nikolaus Krismer)
   - merging (Nikolaus Krismer)
diff --git a/Vagrantfile b/Vagrantfile
index d056ffb..75bc1dd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -91,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder "log/bootstrap", "/var/log/vagrant_bootstrap", create: true, owner: "vagrant", group: "vagrant"
 
   # Setup environment on startup (done using a shell script)
-  config.vm.provision "shell", keep_color: true, path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalDeploy ? "true" : "false"), (isJenki$
+  config.vm.provision "shell", keep_color: true, path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalDeploy ? "true" : "false"), (isJenkinsDeploy ? "true" : "false")]
   config.vm.provision "shell", keep_color: true, path: "bootstrap/createDatabase.sh", args: ["niko", "secretPhdPassword#2014!"]
   config.vm.provision "shell", keep_color: true, path: "bootstrap/importData.sh", args: ["niko", "secretPhdPassword#2014!", (deployAllDatasets ? "true" : "false")]
   # Optionally activate database logging (for queryTimeLogging this is done in the testcase itself now)
-- 
GitLab