git.arvados.org - arvados.git/commit

author	Peter Amstutz <peter.amstutz@curoverse.com>
	Mon, 25 Aug 2014 20:29:32 +0000 (16:29 -0400)
committer	Peter Amstutz <peter.amstutz@curoverse.com>
	Mon, 25 Aug 2014 20:29:32 +0000 (16:29 -0400)
commit	ff2e2d7b53edfec33a77ad1ff2b5a83f02a5be80
tree	e3fb60a3c45cdd103e2b3be757b3dcf0e6c3b2c8	tree \| snapshot
parent	ed9499404901d5e788054a770cc5cb6e8566554e	commit \| diff
parent	da34478ce3e42df6d138c6e6e1db7c49d9d5902c	commit \| diff

Merge branch 'master' into 3036-collection-uuids

Conflicts:
sdk/python/arvados/commands/put.py
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/collections_controller.rb
services/api/app/models/arvados_model.rb
services/api/test/fixtures/groups.yml
services/api/test/fixtures/links.yml

RSS Atom

services/api/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/collections_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/arvados_model.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/link.rb	diff1 \|	diff2 \|	blob \| history
services/api/db/structure.sql	diff1 \|	diff2 \|	blob \| history
services/api/lib/current_api_client.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/fixtures/groups.yml	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/link_test.rb	diff1 \|	diff2 \|	blob \| history