[ARVADOS] updated: a1592e2c6d6e9768a1918f3c59b74d6d19033a55

[git at public.curoverse.com]

Summary of changes:

  discards  b0e88b9708dc008ad552f1c4f23badb360e9169a (commit)
       via  a1592e2c6d6e9768a1918f3c59b74d6d19033a55 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (b0e88b9708dc008ad552f1c4f23badb360e9169a)
            \
             N -- N -- N (a1592e2c6d6e9768a1918f3c59b74d6d19033a55)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a1592e2c6d6e9768a1918f3c59b74d6d19033a55
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 26 17:44:18 2015 -0500

    7851: Use a random display (:100-:499 = port 6100-6499) for Xvfb, instead of always :99.

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index c0e930a..74072ca 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -86,8 +86,10 @@ end
 
 module HeadlessHelper
   class HeadlessSingleton
+    @display = ENV['ARVADOS_TEST_HEADLESS_DISPLAY'] || rand(400)+100
+    STDERR.puts "Using display :#{@display} for headless tests"
     def self.get
-      @headless ||= Headless.new reuse: false
+      @headless ||= Headless.new reuse: false, display: @display
     end
   end
 

-----------------------------------------------------------------------


hooks/post-receive
--