[ARVADOS-DEV] updated: e6a5235b8be6eb8e884d6d648b7bc89179829d9f

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages-all-targets.sh | 4 +++-
 jenkins/run-tests.sh                      | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

       via  e6a5235b8be6eb8e884d6d648b7bc89179829d9f (commit)
       via  b5494642ea862658418d2f9a419b10d1fe25431a (commit)
       via  8003783f717ecb167a47c11d01f459b43670fd0e (commit)
       via  a3ec6d08fcaa76d3b16906f57eb07bbecafce545 (commit)
      from  379365ca0bf7948269ed705af53874f65668d851 (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 e6a5235b8be6eb8e884d6d648b7bc89179829d9f
Merge: 379365c b549464
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Sep 1 16:56:17 2015 -0400

    Merge branch 'master' into 6939-package-sso-server
    
    Conflicts:
    	jenkins/run-build-packages-all-targets.sh
    
    refs #6939

diff --cc jenkins/run-build-packages-all-targets.sh
index 3ddb4ba,2761f9f..ddf87c1
--- a/jenkins/run-build-packages-all-targets.sh
+++ b/jenkins/run-build-packages-all-targets.sh
@@@ -4,13 -4,10 +4,15 @@@ read -rd "\000" helpmessage <<EO
  $(basename $0): Orchestrate run-build-packages.sh for every target
  
  Syntax:
 -        WORKSPACE=/path/to/arvados $(basename $0)
 +        WORKSPACE=/path/to/arvados $(basename $0) [options]
 +
- WORKSPACE=path         Path to the Arvados source tree to build packages from
++Options:
 +
 +--command
 +    Build command to execute (default: use built-in Docker image command)
  
+ WORKSPACE=path         Path to the Arvados source tree to build packages from
+ 
  EOF
  
  if ! [[ -n "$WORKSPACE" ]]; then

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


hooks/post-receive
--