3036: Fix merge conflicts. One python sdk test still fails.
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 26 Aug 2014 12:48:08 +0000 (08:48 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 26 Aug 2014 12:48:08 +0000 (08:48 -0400)
commitf1886a6d0c1dadd06ec751f25c5c1e9469825e1a
treee95c779e6b2c13d16526987bd92a86006f098c1c
parentff2e2d7b53edfec33a77ad1ff2b5a83f02a5be80
3036: Fix merge conflicts.  One python sdk test still fails.
sdk/python/tests/test_arv_put.py
services/api/db/migrate/20140815171049_add_name_description_columns.rb [deleted file]
services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
services/api/db/structure.sql
services/api/test/fixtures/groups.yml