Merge branch 'frameworkTroubleshoot' into development

rack/Gemfile-jruby

@@ -4,3 +4,5 @@ gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
 gem 'jruby-jars', '1.7.4'
 gem 'json', '1.7.6'
+gem "rubyzip", "~> 1.0.0"
+gem "zip-zip", "~> 0.1"

rack/Gemfile-ruby

@@ -2,5 +2,5 @@ source 'http://rubygems.org'
 
 gem 'rack', '1.5.1'
 gem 'json', '1.7.6'
-gem 'passenger', '3.9.5.rc3'
+gem 'passenger', '4.0.19'
 gem "unicorn", "4.6.2"

rails/Gemfile-jruby

@@ -6,3 +6,5 @@ gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
 gem 'jruby-jars', '1.7.4'
 gem 'activerecord-jdbcmysql-adapter', '1.2.6'
+gem "rubyzip", "~> 1.0.0"
+gem "zip-zip", "~> 0.1"

rails/Gemfile-ruby

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.13'
 gem 'mysql2', '0.3.11'
-gem 'passenger', '3.9.5.rc3'
+gem 'passenger',"4.0.19"
 gem "unicorn", "4.6.2"

servicestack/setup_nginx.py

@@ -35,5 +35,5 @@ def stop():
   
   subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + root + "/nginx.conf -s stop", shell=True)
   subprocess.check_call("rm -f " + root + "/nginx.upstream.conf", shell=True)
-  subprocess.check_call("pkill -9 mono-sgen", shell=True)
+  subprocess.check_call("pkill -9 mono", shell=True)
   return 0

sinatra/Gemfile-jruby

@@ -6,3 +6,6 @@ gem 'jruby-jars', '1.7.4'
 gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'activerecord-jdbcmysql-adapter', '1.2.6'
 gem "sinatra-activerecord", "1.2.2"
+gem "rubyzip", "~> 1.0.0"
+gem "zip-zip", "~> 0.1"
+

sinatra/Gemfile-ruby

@@ -4,6 +4,6 @@ gem 'sinatra-contrib', '1.3.2'
 gem 'activerecord', '3.2.11'
 gem 'rack', '1.5.1'
 gem 'mysql2', '0.3.11'
-gem 'passenger', '3.9.5.rc3'
+gem 'passenger', '4.0.19'
 gem "sinatra-activerecord", "1.2.2"
 gem "unicorn", "4.6.2"

toolset/benchmark/benchmarker.py

@@ -639,7 +639,7 @@ class Benchmarker:
   ############################################################
   # __write_intermediate_results
   ############################################################
-  def __write_intermediate_results(test_name,status_message):
+  def __write_intermediate_results(self,test_name,status_message):
     try:
       self.results["completed"][test_name] = status_message
       with open(os.path.join(self.latest_results_directory, 'results.json'), 'w') as f: