Merge branch 'master' into GPII-2060

GPII · Dec 20, 2017 · 4100f8d · 4100f8d
2 parents 8e1d9a9 + cf5fe55
commit 4100f8d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -24,7 +24,7 @@ ram = ENV["VM_RAM"] || 2048
 
 Vagrant.configure(2) do |config|
 
-  config.vm.box = "inclusivedesign/fedora24"
+  config.vm.box = "inclusivedesign/fedora26"
 
   # Your working directory will be synced to /home/vagrant/sync in the VM.
   config.vm.synced_folder ".", "#{app_directory}"

diff --git a/gpii/node_modules/gsettingsBridge/gsettings_bridge.js b/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
diff --git a/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js b/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
diff --git a/provisioning/vars.yml b/provisioning/vars.yml
@@ -8,8 +8,8 @@ nodejs_app_git_repo: https://github.com/gpii/linux.git
 
 nodejs_app_git_branch: master
 
-# Currently Node.js LTS (4.x or "Argon") is required by the GPII
-nodejs_branch: current
+# Currently Node.js 6.x LTS is required by the GPII
+nodejs_branch: lts
 
 # If a specific npm version is needed, specify it here
 #nodejs_npm_version: 1.4.28