git.arvados.org - arvados.git/commit

author	Tom Clegg <tom@curoverse.com>
	Tue, 15 Apr 2014 17:47:52 +0000 (13:47 -0400)
committer	Tom Clegg <tom@curoverse.com>
	Tue, 15 Apr 2014 17:47:52 +0000 (13:47 -0400)
commit	eb7227693e8847a65798afa7f7e8a4ffe8a199a4
tree	35af83bfd0853c9fbbb9191260aa3cec1375fdec	tree \| snapshot
parent	7c5ae57edcd37b5be47e0578b709f41cb97f0748	commit \| diff
parent	c2aeaa729c350a33ec47ae1b012e50a6685ac2d2	commit \| diff

Merge branch 'master' into 2596-refactor-pipeline-create

Conflicts:
apps/workbench/test/functional/users_controller_test.rb
services/api/app/controllers/arvados/v1/jobs_controller.rb
services/api/test/functional/arvados/v1/links_controller_test.rb

RSS Atom

apps/workbench/app/models/arvados_base.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/jobs_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/nodes_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/users_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/arvados_model.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/fixtures/links.yml	diff1 \|	diff2 \|	blob \| history
services/api/test/functional/arvados/v1/links_controller_test.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/unit/user_notifier_test.rb	\|	diff2 \|	blob \| history