Merge branch 'master' into services-r11

Change-Id: Ice6c14e70ca69457e27227bbe253eaabd09dea6d
cloudfoundry · Apr 24, 2012 · fe26867 · fe26867
2 parents cf8d7db + 506e468
commit fe26867
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/fetch_gems b/bin/fetch_gems
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'bundler'
 require 'fileutils'
 require 'logger'
-require 'rubygems'
 
 # Provides functionality similar to `bundle package`, but without needing
 # to install any gems.

diff --git a/spec/unit/priority_queue_spec.rb b/spec/unit/priority_queue_spec.rb
@@ -38,7 +38,7 @@
 
   describe 'high volume' do
     it 'should be able to accept a bunch of random values and return them in non-increasing order' do
-      n  = 100_000
+      n  = (ENV['VCAP_TEST_PQUEUE_LOAD'] || 100_000).to_i
       n.times { val = rand ; @q.insert val,val }
       prev = @q.remove