Merge branch 'master' into 2051-nondeterministic-jobs
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 26 Mar 2014 17:16:37 +0000 (13:16 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 26 Mar 2014 17:16:37 +0000 (13:16 -0400)
commit402461a12dbff7d0ec00c8446b925b021aabc2ed
tree514ea4b23226bba2c82ea49d0fb70f892554546e
parent7c04fe3e0e93d22b9c884934dbbd80fed6072ee3
parentdf4897f1390e58825dd8afcc053955c6d3894169
Merge branch 'master' into 2051-nondeterministic-jobs

Conflicts:
doc/README
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
apps/workbench/doc/README_FOR_APP
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
services/api/app/controllers/arvados/v1/schema_controller.rb