summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorChristopher MacGown <chris@pistoncloud.com>2011-08-19 08:44:14 -0700
committerChristopher MacGown <chris@pistoncloud.com>2011-08-19 08:44:14 -0700
commitc4fc9f0737ec9f8d5c950b850fed9930a68164f4 (patch)
treef126150334d997eb44597ff0548830d6b808bbaa /nova
parent276403dcb6a8c7802c456b88f8dad249b7513e64 (diff)
Add copyright notices
Diffstat (limited to 'nova')
-rw-r--r--nova/api/openstack/create_instance_helper.py1
-rw-r--r--nova/api/openstack/views/servers.py1
-rw-r--r--nova/compute/api.py1
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/037_add_config_drive_to_instances.py4
-rw-r--r--nova/db/sqlalchemy/models.py1
-rw-r--r--nova/scheduler/simple.py1
-rw-r--r--nova/tests/api/openstack/test_servers.py1
-rw-r--r--nova/tests/test_compute.py1
-rw-r--r--nova/virt/libvirt/connection.py1
-rw-r--r--nova/virt/xenapi/vm_utils.py1
10 files changed, 10 insertions, 3 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index d776ae92d..563ef1c42 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -1,4 +1,5 @@
# Copyright 2011 OpenStack LLC.
+# Copyright 2011 Piston Cloud Computing, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index c7bc03bcb..19acb0899 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -1,6 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010-2011 OpenStack LLC.
+# Copyright 2011 Piston Cloud Computing, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/compute/api.py b/nova/compute/api.py
index e42a5bbad..ccf29bd1a 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -2,6 +2,7 @@
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Piston Cloud Computing, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/037_add_config_drive_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/037_add_config_drive_to_instances.py
index 36a6af16f..d3058f00d 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/037_add_config_drive_to_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/037_add_config_drive_to_instances.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack LLC.
+#
+# Copyright 2011 Piston Cloud Computing, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 8a6e2f673..c454cfcc3 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -2,6 +2,7 @@
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Piston Cloud Computing, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py
index 61c76b35d..fc1b3142a 100644
--- a/nova/scheduler/simple.py
+++ b/nova/scheduler/simple.py
@@ -41,7 +41,6 @@ class SimpleScheduler(chance.ChanceScheduler):
def _schedule_instance(self, context, instance_id, *_args, **_kwargs):
"""Picks a host that is up and has the fewest running instances."""
-
instance_ref = db.instance_get(context, instance_id)
if (instance_ref['availability_zone']
and ':' in instance_ref['availability_zone']
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 7d8b222cc..0a46c3fd1 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1,6 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010-2011 OpenStack LLC.
+# Copyright 2011 Piston Cloud Computing, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 227b42fd7..8d1b95f74 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -2,6 +2,7 @@
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Piston Cloud Computing, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index a715da66e..ea47fa99d 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -4,6 +4,7 @@
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
# Copyright (c) 2010 Citrix Systems, Inc.
+# Copyright (c) 2011 Piston Cloud Computing, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 206f522c9..3861f6bd8 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -1,6 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright (c) 2010 Citrix Systems, Inc.
+# Copyright 2011 Piston Cloud Computing, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain