git.arvados.org - arvados.git/commit

author	Peter Amstutz <peter.amstutz@curoverse.com>
	Fri, 25 Apr 2014 19:40:54 +0000 (15:40 -0400)
committer	Peter Amstutz <peter.amstutz@curoverse.com>
	Fri, 25 Apr 2014 19:40:54 +0000 (15:40 -0400)
commit	995dd33ec5bc9ebb7cc4ff075a1f5e1a4e7db20c
tree	941677f687278a9c73446ece938468c82f62a841	tree \| snapshot
parent	4eb42fd91dc5e50840e0d3db5d5201561602a508	commit \| diff

Resolving application_controller.rb merge conflicts, tests pass.

services/api/app/controllers/application_controller.rb		diff \| blob \| history
services/api/lib/eventbus.rb		diff \| blob \| history
services/api/lib/load_param.rb		diff \| blob \| history
services/api/lib/record_filters.rb		diff \| blob \| history
services/api/test/integration/websocket_test.rb		diff \| blob \| history