Merge branch 'master' into 2895-no-more-redis
authorradhika <radhika@curoverse.com>
Tue, 3 Jun 2014 18:46:45 +0000 (14:46 -0400)
committerradhika <radhika@curoverse.com>
Tue, 3 Jun 2014 18:46:45 +0000 (14:46 -0400)
commit436d545670d3637dcd96b429e538b995ee98a49b
treee52fdeca9764351286a563e3163e0e71454b7aa5
parent22e76f53dad163dd1d6703d792d94527d70bb334
parentab2550bca241736c162a435d62fc3ccb4ac5dc8e
Merge branch 'master' into 2895-no-more-redis
services/api/app/controllers/arvados/v1/users_controller.rb