Merge pull request #515 from NREL/2.9.0-rc2

Updating for OpenStudio 2.9.0-rc2
NREL · Sep 30, 2019 · f800af0 · f800af0
2 parents 3b1948c + 7bfd8f9
commit f800af0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ rvm: 2.2.4
 env:
   global:
     - USE_TESTING_TIMEOUTS: "true"
-    - OPENSTUDIO_VERSION=2.9.0 OPENSTUDIO_VERSION_SHA=69317309a3 OPENSTUDIO_VERSION_EXT=-rc1
+    - OPENSTUDIO_VERSION=2.9.0 OPENSTUDIO_VERSION_SHA=7af2e1b26e OPENSTUDIO_VERSION_EXT=-rc2
     - DOCKER_COMPOSE_VERSION=1.21.1
 
 gemfile:

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,8 +3,8 @@ version: 1.0.{build}-{branch}
 environment:
   USE_TESTING_TIMEOUTS: "true"
   OPENSTUDIO_VERSION: 2.9.0
-  OPENSTUDIO_VERSION_SHA: 69317309a3
-  OPENSTUDIO_VERSION_EXT: -rc1
+  OPENSTUDIO_VERSION_SHA: 7af2e1b26e
+  OPENSTUDIO_VERSION_EXT: -rc2
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
 
 

diff --git a/server/Gemfile b/server/Gemfile
@@ -12,6 +12,9 @@ gem 'rake', '~> 12.3'
 # added for support of the project rakefile
 gem 'colored'
 
+# rest client
+gem 'faraday', '0.15.4'
+
 # data modules
 gem 'jbuilder'
 gem 'nokogiri', '~> 1.6'

diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb
@@ -37,6 +37,6 @@ module OpenstudioServer
   VERSION = '2.9.0'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = '-rc1'.freeze # with preceding - or +
-  OS_SHA = '69317309a3'
+  VERSION_EXT = '-rc2'.freeze # with preceding - or +
+  OS_SHA = '7af2e1b26e'
 end