Merge pick up, tweaked role/site/plcore_base or os_manager path when OpenStack not...
authorSiobhan Tully <stully@verivue.com>
Fri, 10 May 2013 14:50:08 +0000 (10:50 -0400)
committerSiobhan Tully <stully@verivue.com>
Fri, 10 May 2013 14:50:08 +0000 (10:50 -0400)
commit732913407cc255ab864e39522585e1b98e654af1
tree511d3abfdd0943edfa5d35590848e33854fc4686
parent30fd4291ad7fdb809bb8ebbf738c3195436c2455
parent0406283b933e66188b997e3a407bf5481e52364d
Merge pick up, tweaked role/site/plcore_base or os_manager path when OpenStack not present
25 files changed:
planetstack/core/admin.py
planetstack/core/api/deployment_networks.py
planetstack/core/api/images.py
planetstack/core/api/keys.py
planetstack/core/api/nodes.py
planetstack/core/api/roles.py
planetstack/core/api/site_privileges.py
planetstack/core/api/sites.py
planetstack/core/api/slice_memberships.py
planetstack/core/api/slices.py
planetstack/core/api/slivers.py
planetstack/core/api/users.py
planetstack/core/models/key.py
planetstack/core/models/plcorebase.py
planetstack/core/models/role.py
planetstack/core/models/site.py
planetstack/core/models/slice.py
planetstack/core/models/sliver.py
planetstack/core/models/subnet.py
planetstack/core/models/user.py
planetstack/core/serializers.py
planetstack/importer/plclassic/slice_importer.py
planetstack/openstack/driver.py
planetstack/openstack/manager.py
planetstack/planetstack/urls.py