Merge branch 'master' into 1932-job-output-persistent
authorTom Clegg <tom@curoverse.com>
Fri, 28 Mar 2014 00:25:07 +0000 (20:25 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 28 Mar 2014 00:25:07 +0000 (20:25 -0400)
commitb0af0440838407be80c6208b15f969bc2942008e
tree38d1c2174b2abcb35c2349156ef7393304742f1f
parentc95bf51af6261d2707421305342043f499b69f67
parent736c7c62cb2bd45637a54ac8937315ba4b64ed37
Merge branch 'master' into 1932-job-output-persistent

Conflicts:
doc/user/tutorials/tutorial-firstscript.html.textile.liquid
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
sdk/cli/bin/arv-run-pipeline-instance
services/api/db/schema.rb
doc/user/tutorials/tutorial-firstscript.html.textile.liquid
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
sdk/cli/bin/arv-run-pipeline-instance
sdk/cli/bin/crunch-job
services/api/app/models/job.rb
services/api/db/schema.rb
services/api/test/functional/arvados/v1/jobs_controller_test.rb