projects / arvados-dev.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9e5a80 7b2fd8f)
Merge branch 'master' into 8028-crunch-dispatch-local 8028-crunch-dispatch-local
authorradhika <radhika@curoverse.com>
Wed, 20 Jan 2016 17:43:32 +0000 (12:43 -0500)
committerradhika <radhika@curoverse.com>
Wed, 20 Jan 2016 17:43:32 +0000 (12:43 -0500)
Conflicts:
jenkins/run-tests.sh

1  2 
jenkins/run-tests.sh patch | diff1 | diff2 | blob | history

diff --cc jenkins/run-tests.sh
index 152319c00c2ad88e1cab45356821bf18ef2605d4,40cf907e1ae6e3c9a252edb581448d7fdc8d3177..12890951f41f6e945a4afe45e99cfe3088ad5cdf
--- 1/jenkins/run-tests.sh
--- 2/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@@ -721,7 -720,7 +721,8 @@@ gostuff=
      services/datamanager/collection
      services/datamanager/keep
      services/datamanager
 +    services/crunch-dispatch-local
+     services/crunch-run
      tools/keep-rsync
      )
  for g in "${gostuff[@]}"