projects / arvados-dev.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit06b0b75584e41e90aa635b6d833936343075c132
tree7fe27b84d654effb582b40e198363a71bf232615tree | snapshot
parentc9e5a801bb72c20b6c56e0b88e78ea5626fb6497commit | diff
parent7b2fd8f0c85a013df886e881d5d97aebf4890169commit | diff
Merge branch 'master' into 8028-crunch-dispatch-local

Conflicts:
jenkins/run-tests.sh
jenkins/run-tests.sh diff1 | diff2 | blob | history