Merge branch 'master' into 9623-reuse-containers
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 13 Sep 2016 21:30:43 +0000 (18:30 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 13 Sep 2016 21:30:43 +0000 (18:30 -0300)
commit62121f9b2f15cd35a6ce5b6e66ccaaae1c1af834
tree85be773fa2df4fa140934b0aafbd2b6d4dd51275
parentf137e22a65cc29d00146a4735fe54d72b299984b
parenta61c6238265db896c91902f27f692f98f780393c
Merge branch 'master' into 9623-reuse-containers
services/api/app/models/container.rb
services/api/test/fixtures/containers.yml
services/api/test/unit/container_request_test.rb
services/api/test/unit/container_test.rb