diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 18:08:11 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 18:08:11 -0400 |
| commit | a845b392fcd46139db9bf5c954f1fee9bcafcba9 (patch) | |
| tree | 12bf5d39989006c19a61efc1da770b81b7f42ba9 | |
| parent | e5443fa3e436a95de9d1c353e8772436c7cba8b6 (diff) | |
| parent | 60ed73265a52f264021bb7452cde9f83181b3dfc (diff) | |
| download | nova-a845b392fcd46139db9bf5c954f1fee9bcafcba9.tar.gz nova-a845b392fcd46139db9bf5c954f1fee9bcafcba9.tar.xz nova-a845b392fcd46139db9bf5c954f1fee9bcafcba9.zip | |
merge with zone phase 1 again
| -rw-r--r-- | nova/api/openstack/servers.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index c7f863764..009ef6db1 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py b/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py index d2b6b9570..ade981687 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py @@ -1,5 +1,4 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. +# Copyright 2010 OpenStack LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may |