[ARVADOS-DEV] updated: 6c6ca86bfa400d880d051fd87c7c1fb9b8905114

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-tests.sh | 66 ++++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

       via  6c6ca86bfa400d880d051fd87c7c1fb9b8905114 (commit)
       via  7b264271f10d442953f216d66f439d770e0fadad (commit)
       via  03d58fa94878d11cac6d25cdb67180060d1e2fe5 (commit)
      from  341344e17cc68abe57ed2a2ef97807f5d01d9232 (commit)

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 6c6ca86bfa400d880d051fd87c7c1fb9b8905114
Merge: 341344e 7b26427
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 10 16:16:15 2015 -0400

    Merge branch 'sigint' closes #5178


commit 7b264271f10d442953f216d66f439d770e0fadad
Merge: 03d58fa 341344e
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 10 16:02:21 2015 -0400

    Merge branch 'master' into sigint
    
    Conflicts:
    	jenkins/run-tests.sh

diff --cc jenkins/run-tests.sh
index b87a7f5,a706068..713ffda
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@@ -582,6 -573,14 +583,13 @@@ test_apiserver() 
  }
  do_test services/api apiserver
  
+ # Shortcut for when we're only running apiserver tests. This saves a bit of time,
+ # because we don't need to start up the api server for subsequent tests.
+ if [ ! -z "$only" ] && [ "$only" == "services/api" ]; then
+   rotate_logfile "$WORKSPACE/services/api/log/" "test.log"
 -
 -  clean_up
++  exit_cleanly
+ fi
+ 
  start_api
  
  test_ruby_sdk() {

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


hooks/post-receive
--