Merge branch 'master' into 9898-container-lock-api
authorradhika <radhika@curoverse.com>
Thu, 8 Sep 2016 15:02:39 +0000 (11:02 -0400)
committerradhika <radhika@curoverse.com>
Thu, 8 Sep 2016 15:02:39 +0000 (11:02 -0400)
commite378ed1d86cbab36f0c7093e4dc189f6184834bf
tree486ce3d6256c35b8b95c0b0cad45275fc11f89d7
parent3ea8a43af615fc16cb8884a7bda78093c449542c
parentea8dcefcfdfea0e90ba5c45e2e692f5e59088e6b
Merge branch 'master' into 9898-container-lock-api

Conflicts:
services/api/app/models/container.rb
services/api/app/models/container.rb