summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Dunsmore <jasondunsmore@gmail.com>2014-02-26 10:30:20 -0600
committerJason Dunsmore <jasondunsmore@gmail.com>2014-03-04 09:03:04 -0600
commitaf464c9afc3dc51fbdd4dc4642a997a870b5d020 (patch)
tree2d702c83ec1a8359fba65ad625ad721db0d185a6
parent97135cbfc03eb069438eb5b8858edaea061aa030 (diff)
downloadheat-af464c9afc3dc51fbdd4dc4642a997a870b5d020.tar.gz
Make the first line of every file consistent.
Change-Id: I2e1a809cfca8e88693551d58d33e747f54ee5eb1
-rwxr-xr-xbin/heat-engine1
-rwxr-xr-xbin/heat-manage2
-rw-r--r--contrib/marconi/marconi/tests/test_queue.py1
-rw-r--r--contrib/rackspace/rackspace/clients.py1
-rw-r--r--contrib/rackspace/rackspace/resources/auto_scale.py2
-rw-r--r--contrib/rackspace/rackspace/resources/cloud_dns.py1
-rw-r--r--contrib/rackspace/rackspace/resources/cloud_server.py1
-rw-r--r--contrib/rackspace/rackspace/resources/cloudnetworks.py1
-rw-r--r--contrib/rackspace/rackspace/tests/test_auto_scale.py2
-rw-r--r--contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py2
-rw-r--r--contrib/rackspace/rackspace/tests/test_cloudnetworks.py1
-rw-r--r--contrib/rackspace/rackspace/tests/test_rackspace_clients.py2
-rw-r--r--contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py1
-rw-r--r--contrib/rackspace/rackspace/tests/test_rackspace_dns.py1
-rw-r--r--doc/source/ext/resources.py1
-rw-r--r--heat/__init__.py2
-rw-r--r--heat/api/aws/ec2token.py1
-rw-r--r--heat/api/aws/exception.py2
-rw-r--r--heat/api/aws/utils.py1
-rw-r--r--heat/api/cfn/__init__.py1
-rw-r--r--heat/api/cfn/v1/__init__.py1
-rw-r--r--heat/api/cfn/v1/signal.py1
-rw-r--r--heat/api/cfn/v1/stacks.py1
-rw-r--r--heat/api/cfn/versions.py1
-rw-r--r--heat/api/cloudwatch/__init__.py1
-rw-r--r--heat/api/cloudwatch/versions.py1
-rw-r--r--heat/api/cloudwatch/watch.py1
-rw-r--r--heat/api/middleware/version_negotiation.py1
-rw-r--r--heat/api/openstack/__init__.py1
-rw-r--r--heat/api/openstack/v1/__init__.py1
-rw-r--r--heat/api/openstack/v1/actions.py1
-rw-r--r--heat/api/openstack/v1/build_info.py1
-rw-r--r--heat/api/openstack/v1/events.py1
-rw-r--r--heat/api/openstack/v1/resources.py1
-rw-r--r--heat/api/openstack/v1/software_configs.py1
-rw-r--r--heat/api/openstack/v1/software_deployments.py1
-rw-r--r--heat/api/openstack/v1/stacks.py1
-rw-r--r--heat/api/openstack/v1/util.py1
-rw-r--r--heat/api/openstack/v1/views/stacks_view.py1
-rw-r--r--heat/api/openstack/v1/views/views_common.py1
-rw-r--r--heat/api/openstack/versions.py1
-rwxr-xr-xheat/cloudinit/loguserdata.py2
-rw-r--r--heat/cloudinit/part_handler.py2
-rw-r--r--heat/cmd/manage.py2
-rw-r--r--heat/common/auth_password.py2
-rw-r--r--heat/common/auth_url.py1
-rw-r--r--heat/common/config.py2
-rw-r--r--heat/common/context.py1
-rw-r--r--heat/common/crypt.py1
-rw-r--r--heat/common/custom_backend_auth.py2
-rw-r--r--heat/common/environment_format.py1
-rw-r--r--heat/common/exception.py2
-rw-r--r--heat/common/heat_keystoneclient.py1
-rw-r--r--heat/common/notify.py1
-rw-r--r--heat/common/plugin_loader.py1
-rw-r--r--heat/common/policy.py2
-rw-r--r--heat/common/systemd.py1
-rw-r--r--heat/common/template_format.py1
-rw-r--r--heat/common/timeutils.py2
-rw-r--r--heat/common/urlfetch.py1
-rw-r--r--heat/common/wsgi.py2
-rw-r--r--heat/db/api.py1
-rw-r--r--heat/db/sqlalchemy/api.py1
-rw-r--r--heat/db/sqlalchemy/filters.py1
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/021_resource_data.py1
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/030_remove_uuidutils.py1
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/031_stack_lock.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/032_decrypt_method.py1
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py2
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py1
-rw-r--r--heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py2
-rw-r--r--heat/db/sqlalchemy/migration.py1
-rwxr-xr-xheat/db/sync.py1
-rw-r--r--heat/db/utils.py1
-rw-r--r--heat/engine/attributes.py1
-rw-r--r--heat/engine/cfn/functions.py1
-rw-r--r--heat/engine/clients.py1
-rw-r--r--heat/engine/constraints.py1
-rw-r--r--heat/engine/dependencies.py1
-rw-r--r--heat/engine/environment.py1
-rw-r--r--heat/engine/event.py1
-rw-r--r--heat/engine/function.py1
-rw-r--r--heat/engine/parameter_groups.py1
-rw-r--r--heat/engine/parameters.py1
-rw-r--r--heat/engine/parser.py1
-rw-r--r--heat/engine/properties.py1
-rw-r--r--heat/engine/resource.py1
-rw-r--r--heat/engine/resources/__init__.py1
-rw-r--r--heat/engine/resources/autoscaling.py1
-rw-r--r--heat/engine/resources/ceilometer/alarm.py1
-rw-r--r--heat/engine/resources/cloud_watch.py1
-rw-r--r--heat/engine/resources/eip.py1
-rw-r--r--heat/engine/resources/instance.py1
-rw-r--r--heat/engine/resources/internet_gateway.py1
-rw-r--r--heat/engine/resources/loadbalancer.py1
-rw-r--r--heat/engine/resources/network_interface.py1
-rw-r--r--heat/engine/resources/neutron/floatingip.py1
-rw-r--r--heat/engine/resources/neutron/loadbalancer.py1
-rw-r--r--heat/engine/resources/neutron/metering.py1
-rw-r--r--heat/engine/resources/neutron/net.py1
-rw-r--r--heat/engine/resources/neutron/network_gateway.py2
-rw-r--r--heat/engine/resources/neutron/neutron.py1
-rw-r--r--heat/engine/resources/neutron/port.py1
-rw-r--r--heat/engine/resources/neutron/router.py1
-rw-r--r--heat/engine/resources/neutron/security_group.py1
-rw-r--r--heat/engine/resources/neutron/subnet.py1
-rw-r--r--heat/engine/resources/neutron/vpnservice.py1
-rw-r--r--heat/engine/resources/nova_floatingip.py1
-rw-r--r--heat/engine/resources/nova_keypair.py1
-rw-r--r--heat/engine/resources/nova_utils.py1
-rw-r--r--heat/engine/resources/os_database.py1
-rw-r--r--heat/engine/resources/random_string.py1
-rw-r--r--heat/engine/resources/resource_group.py1
-rw-r--r--heat/engine/resources/route_table.py1
-rw-r--r--heat/engine/resources/s3.py1
-rw-r--r--heat/engine/resources/security_group.py1
-rw-r--r--heat/engine/resources/server.py1
-rw-r--r--heat/engine/resources/software_config/cloud_config.py1
-rw-r--r--heat/engine/resources/software_config/multi_part.py1
-rw-r--r--heat/engine/resources/software_config/software_config.py1
-rw-r--r--heat/engine/resources/stack.py1
-rw-r--r--heat/engine/resources/subnet.py1
-rw-r--r--heat/engine/resources/swift.py1
-rw-r--r--heat/engine/resources/template_resource.py1
-rw-r--r--heat/engine/resources/user.py1
-rw-r--r--heat/engine/resources/volume.py1
-rw-r--r--heat/engine/resources/vpc.py1
-rw-r--r--heat/engine/resources/wait_condition.py1
-rw-r--r--heat/engine/scheduler.py1
-rw-r--r--heat/engine/service.py1
-rw-r--r--heat/engine/signal_responder.py1
-rw-r--r--heat/engine/stack_lock.py2
-rw-r--r--heat/engine/stack_resource.py1
-rw-r--r--heat/engine/stack_user.py1
-rw-r--r--heat/engine/support.py1
-rw-r--r--heat/engine/template.py1
-rw-r--r--heat/engine/timestamp.py1
-rw-r--r--heat/engine/update.py1
-rw-r--r--heat/engine/watchrule.py1
-rw-r--r--heat/openstack/common/config/generator.py1
-rw-r--r--heat/openstack/common/context.py1
-rw-r--r--heat/openstack/common/crypto/utils.py1
-rw-r--r--heat/openstack/common/db/api.py1
-rw-r--r--heat/openstack/common/db/exception.py1
-rw-r--r--heat/openstack/common/db/sqlalchemy/models.py1
-rw-r--r--heat/openstack/common/db/sqlalchemy/provision.py1
-rw-r--r--heat/openstack/common/db/sqlalchemy/session.py1
-rw-r--r--heat/openstack/common/db/sqlalchemy/test_migrations.py1
-rw-r--r--heat/openstack/common/db/sqlalchemy/utils.py1
-rw-r--r--heat/openstack/common/eventlet_backdoor.py1
-rw-r--r--heat/openstack/common/excutils.py1
-rw-r--r--heat/openstack/common/fileutils.py1
-rw-r--r--heat/openstack/common/fixture/lockutils.py1
-rw-r--r--heat/openstack/common/fixture/mockpatch.py1
-rw-r--r--heat/openstack/common/fixture/moxstubout.py1
-rw-r--r--heat/openstack/common/gettextutils.py1
-rw-r--r--heat/openstack/common/importutils.py1
-rw-r--r--heat/openstack/common/jsonutils.py1
-rw-r--r--heat/openstack/common/local.py1
-rw-r--r--heat/openstack/common/lockutils.py1
-rw-r--r--heat/openstack/common/log.py1
-rw-r--r--heat/openstack/common/log_handler.py1
-rw-r--r--heat/openstack/common/loopingcall.py1
-rw-r--r--heat/openstack/common/network_utils.py1
-rw-r--r--heat/openstack/common/notifier/api.py1
-rw-r--r--heat/openstack/common/notifier/list_notifier.py1
-rw-r--r--heat/openstack/common/notifier/log_notifier.py1
-rw-r--r--heat/openstack/common/notifier/no_op_notifier.py1
-rw-r--r--heat/openstack/common/notifier/proxy.py1
-rw-r--r--heat/openstack/common/notifier/rabbit_notifier.py1
-rw-r--r--heat/openstack/common/notifier/rpc_notifier.py1
-rw-r--r--heat/openstack/common/notifier/rpc_notifier2.py1
-rw-r--r--heat/openstack/common/notifier/test_notifier.py1
-rw-r--r--heat/openstack/common/policy.py1
-rw-r--r--heat/openstack/common/processutils.py1
-rw-r--r--heat/openstack/common/rpc/__init__.py1
-rw-r--r--heat/openstack/common/rpc/amqp.py1
-rw-r--r--heat/openstack/common/rpc/common.py1
-rw-r--r--heat/openstack/common/rpc/dispatcher.py1
-rw-r--r--heat/openstack/common/rpc/impl_fake.py1
-rw-r--r--heat/openstack/common/rpc/impl_kombu.py1
-rw-r--r--heat/openstack/common/rpc/impl_qpid.py1
-rw-r--r--heat/openstack/common/rpc/impl_zmq.py1
-rw-r--r--heat/openstack/common/rpc/matchmaker.py1
-rw-r--r--heat/openstack/common/rpc/matchmaker_redis.py1
-rw-r--r--heat/openstack/common/rpc/matchmaker_ring.py1
-rw-r--r--heat/openstack/common/rpc/proxy.py1
-rw-r--r--heat/openstack/common/rpc/serializer.py1
-rw-r--r--heat/openstack/common/rpc/service.py1
-rw-r--r--heat/openstack/common/rpc/zmq_receiver.py1
-rw-r--r--heat/openstack/common/service.py1
-rw-r--r--heat/openstack/common/sslutils.py1
-rw-r--r--heat/openstack/common/strutils.py1
-rw-r--r--heat/openstack/common/test.py1
-rw-r--r--heat/openstack/common/threadgroup.py1
-rw-r--r--heat/openstack/common/timeutils.py1
-rw-r--r--heat/openstack/common/uuidutils.py1
-rw-r--r--heat/openstack/common/versionutils.py1
-rw-r--r--heat/rpc/client.py2
-rw-r--r--heat/tests/__init__.py2
-rw-r--r--heat/tests/common.py2
-rw-r--r--heat/tests/fakes.py2
-rw-r--r--heat/tests/generic_resource.py2
-rw-r--r--heat/tests/test_api_aws.py2
-rw-r--r--heat/tests/test_api_cfn_v1.py2
-rw-r--r--heat/tests/test_api_cloudwatch.py2
-rw-r--r--heat/tests/test_api_ec2token.py2
-rw-r--r--heat/tests/test_api_openstack_v1.py2
-rw-r--r--heat/tests/test_api_openstack_v1_util.py2
-rw-r--r--heat/tests/test_api_openstack_v1_views_stacks_view_builder.py2
-rw-r--r--heat/tests/test_api_openstack_v1_views_views_common.py2
-rw-r--r--heat/tests/test_attributes.py2
-rw-r--r--heat/tests/test_auth_password.py2
-rw-r--r--heat/tests/test_auth_url.py1
-rw-r--r--heat/tests/test_autoscaling.py2
-rw-r--r--heat/tests/test_autoscaling_update_policy.py2
-rw-r--r--heat/tests/test_ceilometer_alarm.py2
-rw-r--r--heat/tests/test_clients.py2
-rw-r--r--heat/tests/test_cloudwatch.py2
-rw-r--r--heat/tests/test_common_policy.py1
-rw-r--r--heat/tests/test_constraints.py2
-rw-r--r--heat/tests/test_cw_alarm.py2
-rw-r--r--heat/tests/test_dbinstance.py2
-rw-r--r--heat/tests/test_dependencies.py2
-rw-r--r--heat/tests/test_eip.py2
-rw-r--r--heat/tests/test_engine_api_utils.py2
-rw-r--r--heat/tests/test_engine_service.py2
-rw-r--r--heat/tests/test_environment.py1
-rw-r--r--heat/tests/test_environment_format.py2
-rw-r--r--heat/tests/test_event.py2
-rw-r--r--heat/tests/test_exception.py1
-rw-r--r--heat/tests/test_fault_middleware.py2
-rw-r--r--heat/tests/test_function.py2
-rw-r--r--heat/tests/test_heatclient.py2
-rw-r--r--heat/tests/test_hot.py2
-rw-r--r--heat/tests/test_identifier.py2
-rw-r--r--heat/tests/test_instance.py2
-rw-r--r--heat/tests/test_instance_group.py2
-rw-r--r--heat/tests/test_instance_group_update_policy.py2
-rw-r--r--heat/tests/test_instance_network.py2
-rw-r--r--heat/tests/test_iso8601_utils.py2
-rw-r--r--heat/tests/test_loadbalancer.py2
-rw-r--r--heat/tests/test_loguserdata.py2
-rw-r--r--heat/tests/test_metadata_refresh.py2
-rw-r--r--heat/tests/test_nested_stack.py2
-rw-r--r--heat/tests/test_neutron.py2
-rw-r--r--heat/tests/test_neutron_autoscaling.py2
-rw-r--r--heat/tests/test_neutron_loadbalancer.py2
-rw-r--r--heat/tests/test_neutron_metering.py1
-rw-r--r--heat/tests/test_neutron_network_gateway.py2
-rw-r--r--heat/tests/test_neutron_security_group.py2
-rw-r--r--heat/tests/test_neutron_vpnservice.py2
-rw-r--r--heat/tests/test_nokey.py2
-rw-r--r--heat/tests/test_notifications.py1
-rw-r--r--heat/tests/test_nova_floatingip.py1
-rw-r--r--heat/tests/test_nova_keypair.py2
-rw-r--r--heat/tests/test_nova_utils.py1
-rw-r--r--heat/tests/test_os_database.py2
-rw-r--r--heat/tests/test_parameters.py2
-rw-r--r--heat/tests/test_parser.py2
-rw-r--r--heat/tests/test_plugin_loader.py2
-rw-r--r--heat/tests/test_properties.py2
-rw-r--r--heat/tests/test_provider_template.py2
-rw-r--r--heat/tests/test_random_string.py2
-rw-r--r--heat/tests/test_resource.py2
-rw-r--r--heat/tests/test_resource_group.py1
-rw-r--r--heat/tests/test_restarter.py1
-rw-r--r--heat/tests/test_rpc_client.py2
-rw-r--r--heat/tests/test_s3.py2
-rw-r--r--heat/tests/test_scaling_template.py1
-rw-r--r--heat/tests/test_scheduler.py2
-rw-r--r--heat/tests/test_security_group.py2
-rw-r--r--heat/tests/test_server.py2
-rw-r--r--heat/tests/test_server_tags.py2
-rw-r--r--heat/tests/test_short_id.py2
-rw-r--r--heat/tests/test_signal.py2
-rw-r--r--heat/tests/test_sqlalchemy_api.py1
-rw-r--r--heat/tests/test_sqlalchemy_filters.py1
-rw-r--r--heat/tests/test_ssl_middleware.py2
-rw-r--r--heat/tests/test_stack_lock.py2
-rw-r--r--heat/tests/test_stack_resource.py2
-rw-r--r--heat/tests/test_support.py2
-rw-r--r--heat/tests/test_swift.py2
-rw-r--r--heat/tests/test_template_format.py2
-rw-r--r--heat/tests/test_urlfetch.py1
-rw-r--r--heat/tests/test_user.py2
-rw-r--r--heat/tests/test_validate.py2
-rw-r--r--heat/tests/test_version_negotiation_middleware.py2
-rw-r--r--heat/tests/test_volume.py2
-rw-r--r--heat/tests/test_vpc.py2
-rw-r--r--heat/tests/test_waitcondition.py2
-rw-r--r--heat/tests/test_watch.py2
-rw-r--r--heat/tests/test_wsgi.py2
-rw-r--r--heat/tests/utils.py2
-rw-r--r--heat/tests/v1_1/fakes.py1
-rw-r--r--heat/version.py1
-rwxr-xr-xtools/cfn-json2yaml1
-rw-r--r--tools/install_venv.py2
-rw-r--r--tools/install_venv_common.py1
-rwxr-xr-xtools/state_transitions.py2
317 files changed, 212 insertions, 228 deletions
diff --git a/bin/heat-engine b/bin/heat-engine
index 14ef7ce06..3f1e78df6 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-
#
# 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/bin/heat-manage b/bin/heat-manage
index 83d9de774..baf26d7db 100755
--- a/bin/heat-manage
+++ b/bin/heat-manage
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+#
# 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 a copy of the License at
diff --git a/contrib/marconi/marconi/tests/test_queue.py b/contrib/marconi/marconi/tests/test_queue.py
index efa90252c..1d41d65bd 100644
--- a/contrib/marconi/marconi/tests/test_queue.py
+++ b/contrib/marconi/marconi/tests/test_queue.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/clients.py b/contrib/rackspace/rackspace/clients.py
index 3dfe06210..43880f540 100644
--- a/contrib/rackspace/rackspace/clients.py
+++ b/contrib/rackspace/rackspace/clients.py
@@ -1,4 +1,3 @@
-
#
# 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/contrib/rackspace/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py
index 165ac9ff3..afba06344 100644
--- a/contrib/rackspace/rackspace/resources/auto_scale.py
+++ b/contrib/rackspace/rackspace/resources/auto_scale.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/resources/cloud_dns.py b/contrib/rackspace/rackspace/resources/cloud_dns.py
index 6df292570..7f66895a4 100644
--- a/contrib/rackspace/rackspace/resources/cloud_dns.py
+++ b/contrib/rackspace/rackspace/resources/cloud_dns.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/resources/cloud_server.py b/contrib/rackspace/rackspace/resources/cloud_server.py
index 215a7fef3..eaf036de3 100644
--- a/contrib/rackspace/rackspace/resources/cloud_server.py
+++ b/contrib/rackspace/rackspace/resources/cloud_server.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/resources/cloudnetworks.py b/contrib/rackspace/rackspace/resources/cloudnetworks.py
index f018ecd37..34eda6600 100644
--- a/contrib/rackspace/rackspace/resources/cloudnetworks.py
+++ b/contrib/rackspace/rackspace/resources/cloudnetworks.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py
index aa387d334..5dfee947d 100644
--- a/contrib/rackspace/rackspace/tests/test_auto_scale.py
+++ b/contrib/rackspace/rackspace/tests/test_auto_scale.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py
index f7a522f38..be20b964c 100644
--- a/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py
+++ b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/tests/test_cloudnetworks.py b/contrib/rackspace/rackspace/tests/test_cloudnetworks.py
index b31b3cf34..c102a92a7 100644
--- a/contrib/rackspace/rackspace/tests/test_cloudnetworks.py
+++ b/contrib/rackspace/rackspace/tests/test_cloudnetworks.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_clients.py b/contrib/rackspace/rackspace/tests/test_rackspace_clients.py
index a09b5538e..3cab7096e 100644
--- a/contrib/rackspace/rackspace/tests/test_rackspace_clients.py
+++ b/contrib/rackspace/rackspace/tests/test_rackspace_clients.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
index a343ab5cb..7bd781383 100644
--- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
+++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_dns.py b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py
index e3eafd5ff..f44a8e0ea 100644
--- a/contrib/rackspace/rackspace/tests/test_rackspace_dns.py
+++ b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/doc/source/ext/resources.py b/doc/source/ext/resources.py
index 5d1e857d4..7e19212ec 100644
--- a/doc/source/ext/resources.py
+++ b/doc/source/ext/resources.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/__init__.py b/heat/__init__.py
index 2e9772bc7..d6f921a84 100644
--- a/heat/__init__.py
+++ b/heat/__init__.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2013 IBM Corp.
# All Rights Reserved.
#
diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py
index f524cb4a2..fcde85023 100644
--- a/heat/api/aws/ec2token.py
+++ b/heat/api/aws/ec2token.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/aws/exception.py b/heat/api/aws/exception.py
index 7f5140875..2f8dab0fa 100644
--- a/heat/api/aws/exception.py
+++ b/heat/api/aws/exception.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
#
diff --git a/heat/api/aws/utils.py b/heat/api/aws/utils.py
index 530abfa2e..ad4114591 100644
--- a/heat/api/aws/utils.py
+++ b/heat/api/aws/utils.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cfn/__init__.py b/heat/api/cfn/__init__.py
index f298e8ab8..6e294924e 100644
--- a/heat/api/cfn/__init__.py
+++ b/heat/api/cfn/__init__.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cfn/v1/__init__.py b/heat/api/cfn/v1/__init__.py
index 0ff0c5a4f..d772b9452 100644
--- a/heat/api/cfn/v1/__init__.py
+++ b/heat/api/cfn/v1/__init__.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cfn/v1/signal.py b/heat/api/cfn/v1/signal.py
index abfbbf416..3e0a4e09c 100644
--- a/heat/api/cfn/v1/signal.py
+++ b/heat/api/cfn/v1/signal.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index 484170a66..9e730d334 100644
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cfn/versions.py b/heat/api/cfn/versions.py
index 722a79b34..c92a992b3 100644
--- a/heat/api/cfn/versions.py
+++ b/heat/api/cfn/versions.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cloudwatch/__init__.py b/heat/api/cloudwatch/__init__.py
index bb3f9f910..9d36bd193 100644
--- a/heat/api/cloudwatch/__init__.py
+++ b/heat/api/cloudwatch/__init__.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cloudwatch/versions.py b/heat/api/cloudwatch/versions.py
index 722a79b34..c92a992b3 100644
--- a/heat/api/cloudwatch/versions.py
+++ b/heat/api/cloudwatch/versions.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py
index ec4f3b24f..a495bfa7a 100644
--- a/heat/api/cloudwatch/watch.py
+++ b/heat/api/cloudwatch/watch.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/middleware/version_negotiation.py b/heat/api/middleware/version_negotiation.py
index 491a3331b..5d3fdd66c 100644
--- a/heat/api/middleware/version_negotiation.py
+++ b/heat/api/middleware/version_negotiation.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/__init__.py b/heat/api/openstack/__init__.py
index 081cedf99..1a2cfc127 100644
--- a/heat/api/openstack/__init__.py
+++ b/heat/api/openstack/__init__.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/__init__.py b/heat/api/openstack/v1/__init__.py
index b30346410..aba483a36 100644
--- a/heat/api/openstack/v1/__init__.py
+++ b/heat/api/openstack/v1/__init__.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/actions.py b/heat/api/openstack/v1/actions.py
index 23ad9e0c3..b5b93dcef 100644
--- a/heat/api/openstack/v1/actions.py
+++ b/heat/api/openstack/v1/actions.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/build_info.py b/heat/api/openstack/v1/build_info.py
index ac2c05245..dfe8b06c6 100644
--- a/heat/api/openstack/v1/build_info.py
+++ b/heat/api/openstack/v1/build_info.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/events.py b/heat/api/openstack/v1/events.py
index da3cdb1f6..fe1ace337 100644
--- a/heat/api/openstack/v1/events.py
+++ b/heat/api/openstack/v1/events.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/resources.py b/heat/api/openstack/v1/resources.py
index cbe40289b..334f28655 100644
--- a/heat/api/openstack/v1/resources.py
+++ b/heat/api/openstack/v1/resources.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/software_configs.py b/heat/api/openstack/v1/software_configs.py
index e015c1578..0ba659252 100644
--- a/heat/api/openstack/v1/software_configs.py
+++ b/heat/api/openstack/v1/software_configs.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/software_deployments.py b/heat/api/openstack/v1/software_deployments.py
index a770e4f1f..506b772c4 100644
--- a/heat/api/openstack/v1/software_deployments.py
+++ b/heat/api/openstack/v1/software_deployments.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/stacks.py b/heat/api/openstack/v1/stacks.py
index aedb4c917..3852c2e9f 100644
--- a/heat/api/openstack/v1/stacks.py
+++ b/heat/api/openstack/v1/stacks.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/util.py b/heat/api/openstack/v1/util.py
index 081450951..280dab4ef 100644
--- a/heat/api/openstack/v1/util.py
+++ b/heat/api/openstack/v1/util.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/views/stacks_view.py b/heat/api/openstack/v1/views/stacks_view.py
index 3a494a709..4462cfdff 100644
--- a/heat/api/openstack/v1/views/stacks_view.py
+++ b/heat/api/openstack/v1/views/stacks_view.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/v1/views/views_common.py b/heat/api/openstack/v1/views/views_common.py
index ab0bb037d..cccb11030 100644
--- a/heat/api/openstack/v1/views/views_common.py
+++ b/heat/api/openstack/v1/views/views_common.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/api/openstack/versions.py b/heat/api/openstack/versions.py
index 722a79b34..c92a992b3 100644
--- a/heat/api/openstack/versions.py
+++ b/heat/api/openstack/versions.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index 87bd1929b..9c50e9522 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+#
# 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
# a copy of the License at
diff --git a/heat/cloudinit/part_handler.py b/heat/cloudinit/part_handler.py
index 64a24b470..e6a6ce20d 100644
--- a/heat/cloudinit/part_handler.py
+++ b/heat/cloudinit/part_handler.py
@@ -1,5 +1,5 @@
#part-handler
-
+#
# 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
# a copy of the License at
diff --git a/heat/cmd/manage.py b/heat/cmd/manage.py
index 5f2d3e64a..e3821efca 100644
--- a/heat/cmd/manage.py
+++ b/heat/cmd/manage.py
@@ -1,4 +1,4 @@
-
+#
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/common/auth_password.py b/heat/common/auth_password.py
index 723fcfc1a..c6c07affd 100644
--- a/heat/common/auth_password.py
+++ b/heat/common/auth_password.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/heat/common/auth_url.py b/heat/common/auth_url.py
index 4bb825303..d588700aa 100644
--- a/heat/common/auth_url.py
+++ b/heat/common/auth_url.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/heat/common/config.py b/heat/common/config.py
index 9ebf2b714..0daebbd08 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -1,5 +1,3 @@
-
-
#
# 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/heat/common/context.py b/heat/common/context.py
index 8a82afa62..1e0a91ee0 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/crypt.py b/heat/common/crypt.py
index c87678f93..7bf3b6d64 100644
--- a/heat/common/crypt.py
+++ b/heat/common/crypt.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/custom_backend_auth.py b/heat/common/custom_backend_auth.py
index d57de40fc..28ef3d4ba 100644
--- a/heat/common/custom_backend_auth.py
+++ b/heat/common/custom_backend_auth.py
@@ -1,4 +1,4 @@
-
+#
# Copyright (C) 2012, Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/heat/common/environment_format.py b/heat/common/environment_format.py
index 31786c0e2..ea7fe2cbd 100644
--- a/heat/common/environment_format.py
+++ b/heat/common/environment_format.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/exception.py b/heat/common/exception.py
index 5ede75bd8..c4990a17f 100644
--- a/heat/common/exception.py
+++ b/heat/common/exception.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
#
diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py
index 15ec44348..1dcf82c9c 100644
--- a/heat/common/heat_keystoneclient.py
+++ b/heat/common/heat_keystoneclient.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/notify.py b/heat/common/notify.py
index d168482c4..edc37131e 100644
--- a/heat/common/notify.py
+++ b/heat/common/notify.py
@@ -1,3 +1,4 @@
+#
# Copyright 2014 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/common/plugin_loader.py b/heat/common/plugin_loader.py
index aa45f76bc..3b74b8f92 100644
--- a/heat/common/plugin_loader.py
+++ b/heat/common/plugin_loader.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/policy.py b/heat/common/policy.py
index 6468742ce..179c854cb 100644
--- a/heat/common/policy.py
+++ b/heat/common/policy.py
@@ -1,4 +1,4 @@
-
+#
# Copyright (c) 2011 OpenStack Foundation
# All Rights Reserved.
#
diff --git a/heat/common/systemd.py b/heat/common/systemd.py
index f094dd777..1eb7bfa57 100644
--- a/heat/common/systemd.py
+++ b/heat/common/systemd.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/common/template_format.py b/heat/common/template_format.py
index 54e496f86..6e7906055 100644
--- a/heat/common/template_format.py
+++ b/heat/common/template_format.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/timeutils.py b/heat/common/timeutils.py
index 82add4d84..2249cbac6 100644
--- a/heat/common/timeutils.py
+++ b/heat/common/timeutils.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/common/urlfetch.py b/heat/common/urlfetch.py
index 9892103f1..6417e3511 100644
--- a/heat/common/urlfetch.py
+++ b/heat/common/urlfetch.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/common/wsgi.py b/heat/common/wsgi.py
index 557224f34..fd874eed4 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2013 IBM Corp.
diff --git a/heat/db/api.py b/heat/db/api.py
index a0623e3e0..c57daedb8 100644
--- a/heat/db/api.py
+++ b/heat/db/api.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index 7557604d3..830934a9e 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/db/sqlalchemy/filters.py b/heat/db/sqlalchemy/filters.py
index f91b57e3d..959ede859 100644
--- a/heat/db/sqlalchemy/filters.py
+++ b/heat/db/sqlalchemy/filters.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py b/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py
index f2c7925cb..cdbb4c751 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py b/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py
index 3f4905fa9..54c6cb463 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py b/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py
index 602cfd4ad..dac495119 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/017_event_state_status.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py
index 7fc129213..e30f7c360 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py
index 892bdb4fb..f56a8d5ec 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py
index 0da3d2703..7820b65f3 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/021_resource_data.py b/heat/db/sqlalchemy/migrate_repo/versions/021_resource_data.py
index 733336c64..23166b5fe 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/021_resource_data.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/021_resource_data.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py b/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py
index 2491ed0d6..f779a77f9 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/022_stack_event_soft_delete.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py b/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py
index 17e9ba374..5ac0cc9d3 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/023_raw_template_mysql_longtext.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py b/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py
index 642b0f9c8..02cdd87d1 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/024_event_resource_name.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py b/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py
index 24db8e9ea..818f9fb95 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/025_user_creds_drop_service.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py b/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py
index e67309c06..ce4aaf00e 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py b/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py
index c3e73bd4a..647c6bc74 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py b/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py
index b5870af1d..d9c5e88d6 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py
index 7f070e199..790f109b6 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/030_remove_uuidutils.py b/heat/db/sqlalchemy/migrate_repo/versions/030_remove_uuidutils.py
index 76edd68f6..d4db9676c 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/030_remove_uuidutils.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/030_remove_uuidutils.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/031_stack_lock.py b/heat/db/sqlalchemy/migrate_repo/versions/031_stack_lock.py
index f40cff47c..ab44e96ba 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/031_stack_lock.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/031_stack_lock.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/032_decrypt_method.py b/heat/db/sqlalchemy/migrate_repo/versions/032_decrypt_method.py
index cdfc4313b..a96f40acf 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/032_decrypt_method.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/032_decrypt_method.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
index a7a04a234..593a62b03 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py b/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py
index 27901921a..84602a2fd 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/034_raw_template_files.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py b/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py
index e468f767c..e9e7218d4 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py b/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py
index 5f39e77ca..c1babaf0e 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/036_stack_domain_project.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py b/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py
index 6df66df57..2f8eb2401 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py b/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py
index e0c376156..fe9f3187e 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/038_software_config_json_config.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/db/sqlalchemy/migration.py b/heat/db/sqlalchemy/migration.py
index 813416080..c3c613b66 100644
--- a/heat/db/sqlalchemy/migration.py
+++ b/heat/db/sqlalchemy/migration.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/db/sync.py b/heat/db/sync.py
index 6d4013b6e..82f80cac0 100755
--- a/heat/db/sync.py
+++ b/heat/db/sync.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-
#
# 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/heat/db/utils.py b/heat/db/utils.py
index eb5b8b170..9b588997c 100644
--- a/heat/db/utils.py
+++ b/heat/db/utils.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/attributes.py b/heat/engine/attributes.py
index f4b0a5bbf..4418c8caf 100644
--- a/heat/engine/attributes.py
+++ b/heat/engine/attributes.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/cfn/functions.py b/heat/engine/cfn/functions.py
index 964539436..d77f2bfdd 100644
--- a/heat/engine/cfn/functions.py
+++ b/heat/engine/cfn/functions.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/clients.py b/heat/engine/clients.py
index 7d8448bbb..e71b696e5 100644
--- a/heat/engine/clients.py
+++ b/heat/engine/clients.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/constraints.py b/heat/engine/constraints.py
index 995accda7..49da0c553 100644
--- a/heat/engine/constraints.py
+++ b/heat/engine/constraints.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/dependencies.py b/heat/engine/dependencies.py
index bba3c8351..5dfd3cbba 100644
--- a/heat/engine/dependencies.py
+++ b/heat/engine/dependencies.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/environment.py b/heat/engine/environment.py
index 37e0e0a0e..549ab162b 100644
--- a/heat/engine/environment.py
+++ b/heat/engine/environment.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/event.py b/heat/engine/event.py
index 802400ed2..930dc10fd 100644
--- a/heat/engine/event.py
+++ b/heat/engine/event.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/function.py b/heat/engine/function.py
index 2f48ff2e8..2529de14f 100644
--- a/heat/engine/function.py
+++ b/heat/engine/function.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/parameter_groups.py b/heat/engine/parameter_groups.py
index fb6ef8a3d..82839078c 100644
--- a/heat/engine/parameter_groups.py
+++ b/heat/engine/parameter_groups.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/engine/parameters.py b/heat/engine/parameters.py
index 32db4b995..76c22366e 100644
--- a/heat/engine/parameters.py
+++ b/heat/engine/parameters.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/parser.py b/heat/engine/parser.py
index 0b6e3897c..49180d732 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/properties.py b/heat/engine/properties.py
index a77774bec..12e42a99c 100644
--- a/heat/engine/properties.py
+++ b/heat/engine/properties.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resource.py b/heat/engine/resource.py
index 9e8fdad9c..181603b9e 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py
index b6041535c..c83906620 100644
--- a/heat/engine/resources/__init__.py
+++ b/heat/engine/resources/__init__.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py
index 059354967..288a5186e 100644
--- a/heat/engine/resources/autoscaling.py
+++ b/heat/engine/resources/autoscaling.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/ceilometer/alarm.py b/heat/engine/resources/ceilometer/alarm.py
index a0b92863e..ecef1ecd9 100644
--- a/heat/engine/resources/ceilometer/alarm.py
+++ b/heat/engine/resources/ceilometer/alarm.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py
index 9470625cc..782f71531 100644
--- a/heat/engine/resources/cloud_watch.py
+++ b/heat/engine/resources/cloud_watch.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/eip.py b/heat/engine/resources/eip.py
index 0808d3698..f8b5b5aa0 100644
--- a/heat/engine/resources/eip.py
+++ b/heat/engine/resources/eip.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index c1220ed07..dc8189784 100644
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/internet_gateway.py b/heat/engine/resources/internet_gateway.py
index 51d82cbde..fbf66043e 100644
--- a/heat/engine/resources/internet_gateway.py
+++ b/heat/engine/resources/internet_gateway.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py
index 14b4c5916..3b5867abe 100644
--- a/heat/engine/resources/loadbalancer.py
+++ b/heat/engine/resources/loadbalancer.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/network_interface.py b/heat/engine/resources/network_interface.py
index 4ae63b63f..41a7c13d2 100644
--- a/heat/engine/resources/network_interface.py
+++ b/heat/engine/resources/network_interface.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/floatingip.py b/heat/engine/resources/neutron/floatingip.py
index b884427ff..e2505ec21 100644
--- a/heat/engine/resources/neutron/floatingip.py
+++ b/heat/engine/resources/neutron/floatingip.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/loadbalancer.py b/heat/engine/resources/neutron/loadbalancer.py
index d12fa0db6..c932696c2 100644
--- a/heat/engine/resources/neutron/loadbalancer.py
+++ b/heat/engine/resources/neutron/loadbalancer.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/metering.py b/heat/engine/resources/neutron/metering.py
index f97adc6c8..247dd0e02 100644
--- a/heat/engine/resources/neutron/metering.py
+++ b/heat/engine/resources/neutron/metering.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/engine/resources/neutron/net.py b/heat/engine/resources/neutron/net.py
index e5cc802cb..58756cc73 100644
--- a/heat/engine/resources/neutron/net.py
+++ b/heat/engine/resources/neutron/net.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/network_gateway.py b/heat/engine/resources/neutron/network_gateway.py
index 9d52af495..bf347ca44 100644
--- a/heat/engine/resources/neutron/network_gateway.py
+++ b/heat/engine/resources/neutron/network_gateway.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2013 NTT Corp.
# All Rights Reserved.
#
diff --git a/heat/engine/resources/neutron/neutron.py b/heat/engine/resources/neutron/neutron.py
index 0b586c6ba..784997305 100644
--- a/heat/engine/resources/neutron/neutron.py
+++ b/heat/engine/resources/neutron/neutron.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/port.py b/heat/engine/resources/neutron/port.py
index 6a4ae7ba7..004de0346 100644
--- a/heat/engine/resources/neutron/port.py
+++ b/heat/engine/resources/neutron/port.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/router.py b/heat/engine/resources/neutron/router.py
index 0b6b4a6d7..211061db2 100644
--- a/heat/engine/resources/neutron/router.py
+++ b/heat/engine/resources/neutron/router.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/security_group.py b/heat/engine/resources/neutron/security_group.py
index adeae2577..f4937703a 100644
--- a/heat/engine/resources/neutron/security_group.py
+++ b/heat/engine/resources/neutron/security_group.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/subnet.py b/heat/engine/resources/neutron/subnet.py
index 7561e6827..6b9fcd535 100644
--- a/heat/engine/resources/neutron/subnet.py
+++ b/heat/engine/resources/neutron/subnet.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/neutron/vpnservice.py b/heat/engine/resources/neutron/vpnservice.py
index 8a9047b58..3fc8e5e2b 100644
--- a/heat/engine/resources/neutron/vpnservice.py
+++ b/heat/engine/resources/neutron/vpnservice.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/nova_floatingip.py b/heat/engine/resources/nova_floatingip.py
index aa01a6baf..a5bac9dfc 100644
--- a/heat/engine/resources/nova_floatingip.py
+++ b/heat/engine/resources/nova_floatingip.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/engine/resources/nova_keypair.py b/heat/engine/resources/nova_keypair.py
index 1827be901..66b8a25a0 100644
--- a/heat/engine/resources/nova_keypair.py
+++ b/heat/engine/resources/nova_keypair.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/engine/resources/nova_utils.py b/heat/engine/resources/nova_utils.py
index 6735edc00..61599eb3b 100644
--- a/heat/engine/resources/nova_utils.py
+++ b/heat/engine/resources/nova_utils.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/os_database.py b/heat/engine/resources/os_database.py
index 476962360..a30a803cc 100644
--- a/heat/engine/resources/os_database.py
+++ b/heat/engine/resources/os_database.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/random_string.py b/heat/engine/resources/random_string.py
index fc7d2af46..371d1e7fd 100644
--- a/heat/engine/resources/random_string.py
+++ b/heat/engine/resources/random_string.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/resource_group.py b/heat/engine/resources/resource_group.py
index edc54092d..143b24da1 100644
--- a/heat/engine/resources/resource_group.py
+++ b/heat/engine/resources/resource_group.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/route_table.py b/heat/engine/resources/route_table.py
index af8c7e2ea..b656caf67 100644
--- a/heat/engine/resources/route_table.py
+++ b/heat/engine/resources/route_table.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/s3.py b/heat/engine/resources/s3.py
index bde3cc7b0..d38ba0959 100644
--- a/heat/engine/resources/s3.py
+++ b/heat/engine/resources/s3.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py
index 6cf369aea..12c6e7c8f 100644
--- a/heat/engine/resources/security_group.py
+++ b/heat/engine/resources/security_group.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/server.py b/heat/engine/resources/server.py
index 810bb0ee6..e88282bdd 100644
--- a/heat/engine/resources/server.py
+++ b/heat/engine/resources/server.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/software_config/cloud_config.py b/heat/engine/resources/software_config/cloud_config.py
index c3c87ce5d..fa7a4de08 100644
--- a/heat/engine/resources/software_config/cloud_config.py
+++ b/heat/engine/resources/software_config/cloud_config.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/software_config/multi_part.py b/heat/engine/resources/software_config/multi_part.py
index d1bb11a72..d3b742c1c 100644
--- a/heat/engine/resources/software_config/multi_part.py
+++ b/heat/engine/resources/software_config/multi_part.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/software_config/software_config.py b/heat/engine/resources/software_config/software_config.py
index fc3ac72be..beca62de2 100644
--- a/heat/engine/resources/software_config/software_config.py
+++ b/heat/engine/resources/software_config/software_config.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/stack.py b/heat/engine/resources/stack.py
index acc5ce324..e17561088 100644
--- a/heat/engine/resources/stack.py
+++ b/heat/engine/resources/stack.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/subnet.py b/heat/engine/resources/subnet.py
index 1e8e4316c..7f11e793e 100644
--- a/heat/engine/resources/subnet.py
+++ b/heat/engine/resources/subnet.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/swift.py b/heat/engine/resources/swift.py
index f5a3e944c..cac5c9f56 100644
--- a/heat/engine/resources/swift.py
+++ b/heat/engine/resources/swift.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/template_resource.py b/heat/engine/resources/template_resource.py
index 8fb6e9427..e7e7b5dbe 100644
--- a/heat/engine/resources/template_resource.py
+++ b/heat/engine/resources/template_resource.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/user.py b/heat/engine/resources/user.py
index 7ca6678ee..61338918b 100644
--- a/heat/engine/resources/user.py
+++ b/heat/engine/resources/user.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/volume.py b/heat/engine/resources/volume.py
index 03f3ed681..8e21e57cc 100644
--- a/heat/engine/resources/volume.py
+++ b/heat/engine/resources/volume.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/vpc.py b/heat/engine/resources/vpc.py
index ee8538b00..354167bb3 100644
--- a/heat/engine/resources/vpc.py
+++ b/heat/engine/resources/vpc.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py
index ddad74e61..f4d67c9ea 100644
--- a/heat/engine/resources/wait_condition.py
+++ b/heat/engine/resources/wait_condition.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/scheduler.py b/heat/engine/scheduler.py
index 0bd89e004..6a752e47e 100644
--- a/heat/engine/scheduler.py
+++ b/heat/engine/scheduler.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/service.py b/heat/engine/service.py
index 198645e24..ac0fe60c6 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/signal_responder.py b/heat/engine/signal_responder.py
index 503d9105b..c8e8a8a42 100644
--- a/heat/engine/signal_responder.py
+++ b/heat/engine/signal_responder.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/stack_lock.py b/heat/engine/stack_lock.py
index 99abfa1dc..bddfb8908 100644
--- a/heat/engine/stack_lock.py
+++ b/heat/engine/stack_lock.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/engine/stack_resource.py b/heat/engine/stack_resource.py
index 83d1c77f6..465879183 100644
--- a/heat/engine/stack_resource.py
+++ b/heat/engine/stack_resource.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/stack_user.py b/heat/engine/stack_user.py
index e75f671dd..9b6b7e586 100644
--- a/heat/engine/stack_user.py
+++ b/heat/engine/stack_user.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/support.py b/heat/engine/support.py
index c1efc9dbc..10d3001d1 100644
--- a/heat/engine/support.py
+++ b/heat/engine/support.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/template.py b/heat/engine/template.py
index 1f4962e60..2cbccf77b 100644
--- a/heat/engine/template.py
+++ b/heat/engine/template.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/timestamp.py b/heat/engine/timestamp.py
index 931612f85..808689cc5 100644
--- a/heat/engine/timestamp.py
+++ b/heat/engine/timestamp.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/update.py b/heat/engine/update.py
index 1e0c94478..c9d96c2a9 100644
--- a/heat/engine/update.py
+++ b/heat/engine/update.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/engine/watchrule.py b/heat/engine/watchrule.py
index 4abda92eb..a797a94b8 100644
--- a/heat/engine/watchrule.py
+++ b/heat/engine/watchrule.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/openstack/common/config/generator.py b/heat/openstack/common/config/generator.py
index f14afbdd3..852e549b1 100644
--- a/heat/openstack/common/config/generator.py
+++ b/heat/openstack/common/config/generator.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 SINA Corporation
# All Rights Reserved.
#
diff --git a/heat/openstack/common/context.py b/heat/openstack/common/context.py
index 182b04436..0504323a0 100644
--- a/heat/openstack/common/context.py
+++ b/heat/openstack/common/context.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/crypto/utils.py b/heat/openstack/common/crypto/utils.py
index 5bf0bb66f..e80e3b77b 100644
--- a/heat/openstack/common/crypto/utils.py
+++ b/heat/openstack/common/crypto/utils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/db/api.py b/heat/openstack/common/db/api.py
index d4f7333d0..9c8ff8b0d 100644
--- a/heat/openstack/common/db/api.py
+++ b/heat/openstack/common/db/api.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2013 Rackspace Hosting
# All Rights Reserved.
#
diff --git a/heat/openstack/common/db/exception.py b/heat/openstack/common/db/exception.py
index 27987c57b..29934548a 100644
--- a/heat/openstack/common/db/exception.py
+++ b/heat/openstack/common/db/exception.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/db/sqlalchemy/models.py b/heat/openstack/common/db/sqlalchemy/models.py
index c5bb2b1ed..b4213c60b 100644
--- a/heat/openstack/common/db/sqlalchemy/models.py
+++ b/heat/openstack/common/db/sqlalchemy/models.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
diff --git a/heat/openstack/common/db/sqlalchemy/provision.py b/heat/openstack/common/db/sqlalchemy/provision.py
index 2df864c14..b5485ccdb 100644
--- a/heat/openstack/common/db/sqlalchemy/provision.py
+++ b/heat/openstack/common/db/sqlalchemy/provision.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 Mirantis.inc
# All Rights Reserved.
#
diff --git a/heat/openstack/common/db/sqlalchemy/session.py b/heat/openstack/common/db/sqlalchemy/session.py
index 83a00a3e6..011c98447 100644
--- a/heat/openstack/common/db/sqlalchemy/session.py
+++ b/heat/openstack/common/db/sqlalchemy/session.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/db/sqlalchemy/test_migrations.py b/heat/openstack/common/db/sqlalchemy/test_migrations.py
index 949e75d0c..9372e1414 100644
--- a/heat/openstack/common/db/sqlalchemy/test_migrations.py
+++ b/heat/openstack/common/db/sqlalchemy/test_migrations.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010-2011 OpenStack Foundation
# Copyright 2012-2013 IBM Corp.
# All Rights Reserved.
diff --git a/heat/openstack/common/db/sqlalchemy/utils.py b/heat/openstack/common/db/sqlalchemy/utils.py
index b322bc08e..d41bc6d78 100644
--- a/heat/openstack/common/db/sqlalchemy/utils.py
+++ b/heat/openstack/common/db/sqlalchemy/utils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2010-2011 OpenStack Foundation.
diff --git a/heat/openstack/common/eventlet_backdoor.py b/heat/openstack/common/eventlet_backdoor.py
index 7640e2298..fc9cbd225 100644
--- a/heat/openstack/common/eventlet_backdoor.py
+++ b/heat/openstack/common/eventlet_backdoor.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2012 OpenStack Foundation.
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/excutils.py b/heat/openstack/common/excutils.py
index cc4c2c5ff..f3c538adb 100644
--- a/heat/openstack/common/excutils.py
+++ b/heat/openstack/common/excutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# Copyright 2012, Red Hat, Inc.
#
diff --git a/heat/openstack/common/fileutils.py b/heat/openstack/common/fileutils.py
index a7932f06a..59e783f63 100644
--- a/heat/openstack/common/fileutils.py
+++ b/heat/openstack/common/fileutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/fixture/lockutils.py b/heat/openstack/common/fixture/lockutils.py
index 1b6d17aa9..48e13e08a 100644
--- a/heat/openstack/common/fixture/lockutils.py
+++ b/heat/openstack/common/fixture/lockutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/fixture/mockpatch.py b/heat/openstack/common/fixture/mockpatch.py
index 858e77cd0..03006c503 100644
--- a/heat/openstack/common/fixture/mockpatch.py
+++ b/heat/openstack/common/fixture/mockpatch.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2013 Hewlett-Packard Development Company, L.P.
diff --git a/heat/openstack/common/fixture/moxstubout.py b/heat/openstack/common/fixture/moxstubout.py
index e8c031f08..6c0d8c4ba 100644
--- a/heat/openstack/common/fixture/moxstubout.py
+++ b/heat/openstack/common/fixture/moxstubout.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2013 Hewlett-Packard Development Company, L.P.
diff --git a/heat/openstack/common/gettextutils.py b/heat/openstack/common/gettextutils.py
index 20fe89b90..b97bb66c8 100644
--- a/heat/openstack/common/gettextutils.py
+++ b/heat/openstack/common/gettextutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 Red Hat, Inc.
# Copyright 2013 IBM Corp.
# All Rights Reserved.
diff --git a/heat/openstack/common/importutils.py b/heat/openstack/common/importutils.py
index 4fd9ae2bc..e8db06d26 100644
--- a/heat/openstack/common/importutils.py
+++ b/heat/openstack/common/importutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/jsonutils.py b/heat/openstack/common/jsonutils.py
index 14d5ea5a7..a3926b2a9 100644
--- a/heat/openstack/common/jsonutils.py
+++ b/heat/openstack/common/jsonutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2011 Justin Santa Barbara
diff --git a/heat/openstack/common/local.py b/heat/openstack/common/local.py
index 0819d5b97..f153773d9 100644
--- a/heat/openstack/common/local.py
+++ b/heat/openstack/common/local.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/lockutils.py b/heat/openstack/common/lockutils.py
index 6c2d34039..a8fb94dfb 100644
--- a/heat/openstack/common/lockutils.py
+++ b/heat/openstack/common/lockutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/log.py b/heat/openstack/common/log.py
index 431567791..2abf80557 100644
--- a/heat/openstack/common/log.py
+++ b/heat/openstack/common/log.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
diff --git a/heat/openstack/common/log_handler.py b/heat/openstack/common/log_handler.py
index 1de7d3f2d..58cfc194b 100644
--- a/heat/openstack/common/log_handler.py
+++ b/heat/openstack/common/log_handler.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/loopingcall.py b/heat/openstack/common/loopingcall.py
index f74796ba3..fef0adfff 100644
--- a/heat/openstack/common/loopingcall.py
+++ b/heat/openstack/common/loopingcall.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2011 Justin Santa Barbara
diff --git a/heat/openstack/common/network_utils.py b/heat/openstack/common/network_utils.py
index ad5d3635a..3406c9189 100644
--- a/heat/openstack/common/network_utils.py
+++ b/heat/openstack/common/network_utils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/api.py b/heat/openstack/common/notifier/api.py
index 99903e156..82a8fab82 100644
--- a/heat/openstack/common/notifier/api.py
+++ b/heat/openstack/common/notifier/api.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/list_notifier.py b/heat/openstack/common/notifier/list_notifier.py
index abe40e7cf..b4d145c5c 100644
--- a/heat/openstack/common/notifier/list_notifier.py
+++ b/heat/openstack/common/notifier/list_notifier.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack LLC.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/log_notifier.py b/heat/openstack/common/notifier/log_notifier.py
index bd5e87e87..30be2e3aa 100644
--- a/heat/openstack/common/notifier/log_notifier.py
+++ b/heat/openstack/common/notifier/log_notifier.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/no_op_notifier.py b/heat/openstack/common/notifier/no_op_notifier.py
index 13d946e36..4d119edcc 100644
--- a/heat/openstack/common/notifier/no_op_notifier.py
+++ b/heat/openstack/common/notifier/no_op_notifier.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/proxy.py b/heat/openstack/common/notifier/proxy.py
index e31194370..6fe1cdb1a 100644
--- a/heat/openstack/common/notifier/proxy.py
+++ b/heat/openstack/common/notifier/proxy.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/notifier/rabbit_notifier.py b/heat/openstack/common/notifier/rabbit_notifier.py
index 74785c071..39b9d05ef 100644
--- a/heat/openstack/common/notifier/rabbit_notifier.py
+++ b/heat/openstack/common/notifier/rabbit_notifier.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 Red Hat, Inc.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/rpc_notifier.py b/heat/openstack/common/notifier/rpc_notifier.py
index c9db51b56..6ba448277 100644
--- a/heat/openstack/common/notifier/rpc_notifier.py
+++ b/heat/openstack/common/notifier/rpc_notifier.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/rpc_notifier2.py b/heat/openstack/common/notifier/rpc_notifier2.py
index 71822dce4..e4b5cbc8e 100644
--- a/heat/openstack/common/notifier/rpc_notifier2.py
+++ b/heat/openstack/common/notifier/rpc_notifier2.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/notifier/test_notifier.py b/heat/openstack/common/notifier/test_notifier.py
index 11fc21fc3..cd619a48a 100644
--- a/heat/openstack/common/notifier/test_notifier.py
+++ b/heat/openstack/common/notifier/test_notifier.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/policy.py b/heat/openstack/common/policy.py
index 396d69180..01e1a2f91 100644
--- a/heat/openstack/common/policy.py
+++ b/heat/openstack/common/policy.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2012 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/processutils.py b/heat/openstack/common/processutils.py
index 313f5a993..525ae7874 100644
--- a/heat/openstack/common/processutils.py
+++ b/heat/openstack/common/processutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/rpc/__init__.py b/heat/openstack/common/rpc/__init__.py
index efacdcf98..8cd4f2da5 100644
--- a/heat/openstack/common/rpc/__init__.py
+++ b/heat/openstack/common/rpc/__init__.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/rpc/amqp.py b/heat/openstack/common/rpc/amqp.py
index 6b7a954bc..84775ccbe 100644
--- a/heat/openstack/common/rpc/amqp.py
+++ b/heat/openstack/common/rpc/amqp.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/rpc/common.py b/heat/openstack/common/rpc/common.py
index b475bfca2..49ea2f459 100644
--- a/heat/openstack/common/rpc/common.py
+++ b/heat/openstack/common/rpc/common.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/rpc/dispatcher.py b/heat/openstack/common/rpc/dispatcher.py
index 7171c4d38..74140c85b 100644
--- a/heat/openstack/common/rpc/dispatcher.py
+++ b/heat/openstack/common/rpc/dispatcher.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/impl_fake.py b/heat/openstack/common/rpc/impl_fake.py
index da215919b..cbc4d4c63 100644
--- a/heat/openstack/common/rpc/impl_fake.py
+++ b/heat/openstack/common/rpc/impl_fake.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/impl_kombu.py b/heat/openstack/common/rpc/impl_kombu.py
index af00b3ffe..6500d0dfd 100644
--- a/heat/openstack/common/rpc/impl_kombu.py
+++ b/heat/openstack/common/rpc/impl_kombu.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/impl_qpid.py b/heat/openstack/common/rpc/impl_qpid.py
index 14baceab3..0eb1e4e90 100644
--- a/heat/openstack/common/rpc/impl_qpid.py
+++ b/heat/openstack/common/rpc/impl_qpid.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation
# Copyright 2011 - 2012, Red Hat, Inc.
#
diff --git a/heat/openstack/common/rpc/impl_zmq.py b/heat/openstack/common/rpc/impl_zmq.py
index e10b76836..9ab15c3ea 100644
--- a/heat/openstack/common/rpc/impl_zmq.py
+++ b/heat/openstack/common/rpc/impl_zmq.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 Cloudscaling Group, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/matchmaker.py b/heat/openstack/common/rpc/matchmaker.py
index e27e5305e..7dbb0228d 100644
--- a/heat/openstack/common/rpc/matchmaker.py
+++ b/heat/openstack/common/rpc/matchmaker.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 Cloudscaling Group, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/matchmaker_redis.py b/heat/openstack/common/rpc/matchmaker_redis.py
index 75a771fe8..929d21f23 100644
--- a/heat/openstack/common/rpc/matchmaker_redis.py
+++ b/heat/openstack/common/rpc/matchmaker_redis.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 Cloudscaling Group, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/matchmaker_ring.py b/heat/openstack/common/rpc/matchmaker_ring.py
index 6af718d77..53b7b1ceb 100644
--- a/heat/openstack/common/rpc/matchmaker_ring.py
+++ b/heat/openstack/common/rpc/matchmaker_ring.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011-2013 Cloudscaling Group, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/proxy.py b/heat/openstack/common/rpc/proxy.py
index 8ea5ac379..cd671ee77 100644
--- a/heat/openstack/common/rpc/proxy.py
+++ b/heat/openstack/common/rpc/proxy.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012-2013 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/serializer.py b/heat/openstack/common/rpc/serializer.py
index 9bc6e2a3a..14f7e4909 100644
--- a/heat/openstack/common/rpc/serializer.py
+++ b/heat/openstack/common/rpc/serializer.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/rpc/service.py b/heat/openstack/common/rpc/service.py
index f419d1145..8f1434de2 100644
--- a/heat/openstack/common/rpc/service.py
+++ b/heat/openstack/common/rpc/service.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/heat/openstack/common/rpc/zmq_receiver.py b/heat/openstack/common/rpc/zmq_receiver.py
index 799b3c7e8..d3847eb29 100644
--- a/heat/openstack/common/rpc/zmq_receiver.py
+++ b/heat/openstack/common/rpc/zmq_receiver.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/service.py b/heat/openstack/common/service.py
index 10dfdbda4..955e3c2c3 100644
--- a/heat/openstack/common/service.py
+++ b/heat/openstack/common/service.py
@@ -1,3 +1,4 @@
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2011 Justin Santa Barbara
diff --git a/heat/openstack/common/sslutils.py b/heat/openstack/common/sslutils.py
index 8cddf8aa7..d6255943b 100644
--- a/heat/openstack/common/sslutils.py
+++ b/heat/openstack/common/sslutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/strutils.py b/heat/openstack/common/strutils.py
index a552504d2..4544ac72c 100644
--- a/heat/openstack/common/strutils.py
+++ b/heat/openstack/common/strutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/test.py b/heat/openstack/common/test.py
index 1165c9d13..3da65e17d 100644
--- a/heat/openstack/common/test.py
+++ b/heat/openstack/common/test.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/threadgroup.py b/heat/openstack/common/threadgroup.py
index 176360a3b..65a3c38a0 100644
--- a/heat/openstack/common/threadgroup.py
+++ b/heat/openstack/common/threadgroup.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/openstack/common/timeutils.py b/heat/openstack/common/timeutils.py
index 52688a026..60fcb0fa8 100644
--- a/heat/openstack/common/timeutils.py
+++ b/heat/openstack/common/timeutils.py
@@ -1,3 +1,4 @@
+#
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/uuidutils.py b/heat/openstack/common/uuidutils.py
index 234b880c9..ac6694dd6 100644
--- a/heat/openstack/common/uuidutils.py
+++ b/heat/openstack/common/uuidutils.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2012 Intel Corporation.
# All Rights Reserved.
#
diff --git a/heat/openstack/common/versionutils.py b/heat/openstack/common/versionutils.py
index 421652b2c..548873492 100644
--- a/heat/openstack/common/versionutils.py
+++ b/heat/openstack/common/versionutils.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2013 OpenStack Foundation
# All Rights Reserved.
#
diff --git a/heat/rpc/client.py b/heat/rpc/client.py
index 8f883765d..42f6c3201 100644
--- a/heat/rpc/client.py
+++ b/heat/rpc/client.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2012, Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/tests/__init__.py b/heat/tests/__init__.py
index 44ecb97cc..2a4c3f68e 100644
--- a/heat/tests/__init__.py
+++ b/heat/tests/__init__.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/common.py b/heat/tests/common.py
index adaac4e7f..20c149672 100644
--- a/heat/tests/common.py
+++ b/heat/tests/common.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py
index a8690faa1..1666e9c56 100644
--- a/heat/tests/fakes.py
+++ b/heat/tests/fakes.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/generic_resource.py b/heat/tests/generic_resource.py
index c3c8d86e2..2c1cb2e3f 100644
--- a/heat/tests/generic_resource.py
+++ b/heat/tests/generic_resource.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_aws.py b/heat/tests/test_api_aws.py
index bbec7db35..c58363bff 100644
--- a/heat/tests/test_api_aws.py
+++ b/heat/tests/test_api_aws.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index fcaa43fad..25ce1897c 100644
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py
index 13a4f7ef5..f53e93eaf 100644
--- a/heat/tests/test_api_cloudwatch.py
+++ b/heat/tests/test_api_cloudwatch.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_ec2token.py b/heat/tests/test_api_ec2token.py
index 58d38443c..b7f5bb683 100644
--- a/heat/tests/test_api_ec2token.py
+++ b/heat/tests/test_api_ec2token.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index a12d4b301..9b6c60300 100644
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_openstack_v1_util.py b/heat/tests/test_api_openstack_v1_util.py
index 8208b512c..fa143debe 100644
--- a/heat/tests/test_api_openstack_v1_util.py
+++ b/heat/tests/test_api_openstack_v1_util.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py b/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py
index d73b29343..4f9bdb35a 100644
--- a/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py
+++ b/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_api_openstack_v1_views_views_common.py b/heat/tests/test_api_openstack_v1_views_views_common.py
index 6b97bd9e8..6d83a9710 100644
--- a/heat/tests/test_api_openstack_v1_views_views_common.py
+++ b/heat/tests/test_api_openstack_v1_views_views_common.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_attributes.py b/heat/tests/test_attributes.py
index 2e8dbf876..0f929cd83 100644
--- a/heat/tests/test_attributes.py
+++ b/heat/tests/test_attributes.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_auth_password.py b/heat/tests/test_auth_password.py
index 015c5a380..3b8b7a0f6 100644
--- a/heat/tests/test_auth_password.py
+++ b/heat/tests/test_auth_password.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/heat/tests/test_auth_url.py b/heat/tests/test_auth_url.py
index dc0483a45..19dde9090 100644
--- a/heat/tests/test_auth_url.py
+++ b/heat/tests/test_auth_url.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py
index 25ba72c4c..7bdcb3cb3 100644
--- a/heat/tests/test_autoscaling.py
+++ b/heat/tests/test_autoscaling.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_autoscaling_update_policy.py b/heat/tests/test_autoscaling_update_policy.py
index 83723d95b..cd0923d9c 100644
--- a/heat/tests/test_autoscaling_update_policy.py
+++ b/heat/tests/test_autoscaling_update_policy.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py
index 123a1ea2e..34a324d4c 100644
--- a/heat/tests/test_ceilometer_alarm.py
+++ b/heat/tests/test_ceilometer_alarm.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_clients.py b/heat/tests/test_clients.py
index e2f67556d..dbba5735f 100644
--- a/heat/tests/test_clients.py
+++ b/heat/tests/test_clients.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_cloudwatch.py b/heat/tests/test_cloudwatch.py
index 2624f6656..34af2d3e3 100644
--- a/heat/tests/test_cloudwatch.py
+++ b/heat/tests/test_cloudwatch.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_common_policy.py b/heat/tests/test_common_policy.py
index 461010ed0..a95dcdaf7 100644
--- a/heat/tests/test_common_policy.py
+++ b/heat/tests/test_common_policy.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 OpenStack Foundation
# All Rights Reserved.
#
diff --git a/heat/tests/test_constraints.py b/heat/tests/test_constraints.py
index 960351959..ec2c719ba 100644
--- a/heat/tests/test_constraints.py
+++ b/heat/tests/test_constraints.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_cw_alarm.py b/heat/tests/test_cw_alarm.py
index 3dea10a05..947a77840 100644
--- a/heat/tests/test_cw_alarm.py
+++ b/heat/tests/test_cw_alarm.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py
index bd3cd79f5..0d2502c34 100644
--- a/heat/tests/test_dbinstance.py
+++ b/heat/tests/test_dbinstance.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_dependencies.py b/heat/tests/test_dependencies.py
index 0d37b515b..4d56bbbb0 100644
--- a/heat/tests/test_dependencies.py
+++ b/heat/tests/test_dependencies.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py
index dcb9eb6cd..9cbb1bd79 100644
--- a/heat/tests/test_eip.py
+++ b/heat/tests/test_eip.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py
index 4b588c2f0..759d562b8 100644
--- a/heat/tests/test_engine_api_utils.py
+++ b/heat/tests/test_engine_api_utils.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index beac5b85e..ab8810d03 100644
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_environment.py b/heat/tests/test_environment.py
index a78593c82..3854db1ad 100644
--- a/heat/tests/test_environment.py
+++ b/heat/tests/test_environment.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/tests/test_environment_format.py b/heat/tests/test_environment_format.py
index 9807da561..75d975d93 100644
--- a/heat/tests/test_environment_format.py
+++ b/heat/tests/test_environment_format.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py
index bfb731fea..998f392e6 100644
--- a/heat/tests/test_event.py
+++ b/heat/tests/test_event.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_exception.py b/heat/tests/test_exception.py
index fe2afa34d..f15b5b3a2 100644
--- a/heat/tests/test_exception.py
+++ b/heat/tests/test_exception.py
@@ -1,3 +1,4 @@
+#
# Copyright 2012 OpenStack Foundation
# All Rights Reserved.
#
diff --git a/heat/tests/test_fault_middleware.py b/heat/tests/test_fault_middleware.py
index 93bdd8629..ce82904af 100644
--- a/heat/tests/test_fault_middleware.py
+++ b/heat/tests/test_fault_middleware.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_function.py b/heat/tests/test_function.py
index e0d2241b3..9b5176d37 100644
--- a/heat/tests/test_function.py
+++ b/heat/tests/test_function.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py
index a2171b16c..d28ebe9ad 100644
--- a/heat/tests/test_heatclient.py
+++ b/heat/tests/test_heatclient.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_hot.py b/heat/tests/test_hot.py
index f9fe1bd6e..8f97730ab 100644
--- a/heat/tests/test_hot.py
+++ b/heat/tests/test_hot.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_identifier.py b/heat/tests/test_identifier.py
index d913edbda..41991074e 100644
--- a/heat/tests/test_identifier.py
+++ b/heat/tests/test_identifier.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index 859f214e9..6a2e364dc 100644
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py
index d08f47524..3123e4558 100644
--- a/heat/tests/test_instance_group.py
+++ b/heat/tests/test_instance_group.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_instance_group_update_policy.py b/heat/tests/test_instance_group_update_policy.py
index 542862143..2e6cc8259 100644
--- a/heat/tests/test_instance_group_update_policy.py
+++ b/heat/tests/test_instance_group_update_policy.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py
index 0aa3fc7b5..7c0651910 100644
--- a/heat/tests/test_instance_network.py
+++ b/heat/tests/test_instance_network.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_iso8601_utils.py b/heat/tests/test_iso8601_utils.py
index 4a91ec36b..cf4844f38 100644
--- a/heat/tests/test_iso8601_utils.py
+++ b/heat/tests/test_iso8601_utils.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 0871b2488..38bc6cfcb 100644
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_loguserdata.py b/heat/tests/test_loguserdata.py
index 54cd50c16..10641494b 100644
--- a/heat/tests/test_loguserdata.py
+++ b/heat/tests/test_loguserdata.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index eaa0005c0..ce1b87b2a 100644
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py
index a555e9dd3..e6ce69e3b 100644
--- a/heat/tests/test_nested_stack.py
+++ b/heat/tests/test_nested_stack.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_neutron.py b/heat/tests/test_neutron.py
index 91259619e..344356e73 100644
--- a/heat/tests/test_neutron.py
+++ b/heat/tests/test_neutron.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_neutron_autoscaling.py b/heat/tests/test_neutron_autoscaling.py
index 470fff12e..684b23a32 100644
--- a/heat/tests/test_neutron_autoscaling.py
+++ b/heat/tests/test_neutron_autoscaling.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_neutron_loadbalancer.py b/heat/tests/test_neutron_loadbalancer.py
index f8a0164c5..9e9d4efba 100644
--- a/heat/tests/test_neutron_loadbalancer.py
+++ b/heat/tests/test_neutron_loadbalancer.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_neutron_metering.py b/heat/tests/test_neutron_metering.py
index 1df342ccd..6d3b5aac0 100644
--- a/heat/tests/test_neutron_metering.py
+++ b/heat/tests/test_neutron_metering.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_neutron_network_gateway.py b/heat/tests/test_neutron_network_gateway.py
index 06a48b71d..e00e90782 100644
--- a/heat/tests/test_neutron_network_gateway.py
+++ b/heat/tests/test_neutron_network_gateway.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2013 NTT Corp.
# All Rights Reserved.
#
diff --git a/heat/tests/test_neutron_security_group.py b/heat/tests/test_neutron_security_group.py
index 216f88764..ccd260922 100644
--- a/heat/tests/test_neutron_security_group.py
+++ b/heat/tests/test_neutron_security_group.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_neutron_vpnservice.py b/heat/tests/test_neutron_vpnservice.py
index a023c457e..f7515fdc1 100644
--- a/heat/tests/test_neutron_vpnservice.py
+++ b/heat/tests/test_neutron_vpnservice.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_nokey.py b/heat/tests/test_nokey.py
index 4a8aa3da1..38c1d4afa 100644
--- a/heat/tests/test_nokey.py
+++ b/heat/tests/test_nokey.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_notifications.py b/heat/tests/test_notifications.py
index d1acf303f..a7b7540e6 100644
--- a/heat/tests/test_notifications.py
+++ b/heat/tests/test_notifications.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_nova_floatingip.py b/heat/tests/test_nova_floatingip.py
index 97528b8fd..15bdc9a66 100644
--- a/heat/tests/test_nova_floatingip.py
+++ b/heat/tests/test_nova_floatingip.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_nova_keypair.py b/heat/tests/test_nova_keypair.py
index cd988b32c..4a7f4b167 100644
--- a/heat/tests/test_nova_keypair.py
+++ b/heat/tests/test_nova_keypair.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_nova_utils.py b/heat/tests/test_nova_utils.py
index e09e2ad8a..f913e150d 100644
--- a/heat/tests/test_nova_utils.py
+++ b/heat/tests/test_nova_utils.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/tests/test_os_database.py b/heat/tests/test_os_database.py
index 8c63df849..a7b884c62 100644
--- a/heat/tests/test_os_database.py
+++ b/heat/tests/test_os_database.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_parameters.py b/heat/tests/test_parameters.py
index 6ad54c6ce..9a5b5073d 100644
--- a/heat/tests/test_parameters.py
+++ b/heat/tests/test_parameters.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index a4d88c463..4f0cf7ba2 100644
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_plugin_loader.py b/heat/tests/test_plugin_loader.py
index 37e8dd6fb..e41f8d574 100644
--- a/heat/tests/test_plugin_loader.py
+++ b/heat/tests/test_plugin_loader.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_properties.py b/heat/tests/test_properties.py
index 261ae0a45..722c5ad05 100644
--- a/heat/tests/test_properties.py
+++ b/heat/tests/test_properties.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py
index 2ae10175b..a55719d75 100644
--- a/heat/tests/test_provider_template.py
+++ b/heat/tests/test_provider_template.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_random_string.py b/heat/tests/test_random_string.py
index baa27a4ca..5354dee22 100644
--- a/heat/tests/test_random_string.py
+++ b/heat/tests/test_random_string.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py
index ae53c62be..29fa353b8 100644
--- a/heat/tests/test_resource.py
+++ b/heat/tests/test_resource.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_resource_group.py b/heat/tests/test_resource_group.py
index 3d8cfbb5b..40de68d31 100644
--- a/heat/tests/test_resource_group.py
+++ b/heat/tests/test_resource_group.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/tests/test_restarter.py b/heat/tests/test_restarter.py
index 5a64e8f37..43f5e24fc 100644
--- a/heat/tests/test_restarter.py
+++ b/heat/tests/test_restarter.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_rpc_client.py b/heat/tests/test_rpc_client.py
index ebad18dff..085828875 100644
--- a/heat/tests/test_rpc_client.py
+++ b/heat/tests/test_rpc_client.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2012, Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py
index 3b72881af..c4366f24a 100644
--- a/heat/tests/test_s3.py
+++ b/heat/tests/test_s3.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_scaling_template.py b/heat/tests/test_scaling_template.py
index a1957158b..a28f2e160 100644
--- a/heat/tests/test_scaling_template.py
+++ b/heat/tests/test_scaling_template.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_scheduler.py b/heat/tests/test_scheduler.py
index 79bff23b7..cef253477 100644
--- a/heat/tests/test_scheduler.py
+++ b/heat/tests/test_scheduler.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_security_group.py b/heat/tests/test_security_group.py
index ca37cec62..5e8a963ca 100644
--- a/heat/tests/test_security_group.py
+++ b/heat/tests/test_security_group.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_server.py b/heat/tests/test_server.py
index d7ac28366..b4afe020b 100644
--- a/heat/tests/test_server.py
+++ b/heat/tests/test_server.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py
index e0f10f889..80bb2671b 100644
--- a/heat/tests/test_server_tags.py
+++ b/heat/tests/test_server_tags.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_short_id.py b/heat/tests/test_short_id.py
index 25be5310a..219b72b51 100644
--- a/heat/tests/test_short_id.py
+++ b/heat/tests/test_short_id.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py
index e748e9132..dc671b85e 100644
--- a/heat/tests/test_signal.py
+++ b/heat/tests/test_signal.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py
index 5f4d33e9a..93ee2332a 100644
--- a/heat/tests/test_sqlalchemy_api.py
+++ b/heat/tests/test_sqlalchemy_api.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_sqlalchemy_filters.py b/heat/tests/test_sqlalchemy_filters.py
index b93e1b4cb..b19672282 100644
--- a/heat/tests/test_sqlalchemy_filters.py
+++ b/heat/tests/test_sqlalchemy_filters.py
@@ -1,3 +1,4 @@
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_ssl_middleware.py b/heat/tests/test_ssl_middleware.py
index cee59b536..1a05e1497 100644
--- a/heat/tests/test_ssl_middleware.py
+++ b/heat/tests/test_ssl_middleware.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_stack_lock.py b/heat/tests/test_stack_lock.py
index f7d88b020..1e87434dc 100644
--- a/heat/tests/test_stack_lock.py
+++ b/heat/tests/test_stack_lock.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py
index afb8e1fc8..d11111ed9 100644
--- a/heat/tests/test_stack_resource.py
+++ b/heat/tests/test_stack_resource.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_support.py b/heat/tests/test_support.py
index e3f9d0378..6b8e46ff4 100644
--- a/heat/tests/test_support.py
+++ b/heat/tests/test_support.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_swift.py b/heat/tests/test_swift.py
index 088be5460..10d5ff857 100644
--- a/heat/tests/test_swift.py
+++ b/heat/tests/test_swift.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py
index 45ea1a04b..a4f653472 100644
--- a/heat/tests/test_template_format.py
+++ b/heat/tests/test_template_format.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_urlfetch.py b/heat/tests/test_urlfetch.py
index f113b53b0..bb54e70d1 100644
--- a/heat/tests/test_urlfetch.py
+++ b/heat/tests/test_urlfetch.py
@@ -1,4 +1,3 @@
-
#
# 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/heat/tests/test_user.py b/heat/tests/test_user.py
index 23fabd858..ee421dca1 100644
--- a/heat/tests/test_user.py
+++ b/heat/tests/test_user.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 01da0356f..14b8acfca 100644
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_version_negotiation_middleware.py b/heat/tests/test_version_negotiation_middleware.py
index 409f6df08..c873843ec 100644
--- a/heat/tests/test_version_negotiation_middleware.py
+++ b/heat/tests/test_version_negotiation_middleware.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index bcc7d7fb2..6aef78b01 100644
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py
index 2abd58b03..b1afb5af9 100644
--- a/heat/tests/test_vpc.py
+++ b/heat/tests/test_vpc.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index 2e690387f..59b7403f6 100644
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py
index bc1c4d7ce..dd89a1446 100644
--- a/heat/tests/test_watch.py
+++ b/heat/tests/test_watch.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/test_wsgi.py b/heat/tests/test_wsgi.py
index 4a14f3c8e..f729370ee 100644
--- a/heat/tests/test_wsgi.py
+++ b/heat/tests/test_wsgi.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2010-2011 OpenStack Foundation
# All Rights Reserved.
#
diff --git a/heat/tests/utils.py b/heat/tests/utils.py
index 0b5f42e5f..fe99a2f38 100644
--- a/heat/tests/utils.py
+++ b/heat/tests/utils.py
@@ -1,4 +1,4 @@
-
+#
# 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
# a copy of the License at
diff --git a/heat/tests/v1_1/fakes.py b/heat/tests/v1_1/fakes.py
index b88b7d013..8a9925920 100644
--- a/heat/tests/v1_1/fakes.py
+++ b/heat/tests/v1_1/fakes.py
@@ -1,3 +1,4 @@
+#
# Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
# Copyright 2011 OpenStack Foundation
#
diff --git a/heat/version.py b/heat/version.py
index 4a2b02130..a8cd2d7dc 100644
--- a/heat/version.py
+++ b/heat/version.py
@@ -1,4 +1,3 @@
-
#
# 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/tools/cfn-json2yaml b/tools/cfn-json2yaml
index 46ecedd05..ec2f371a7 100755
--- a/tools/cfn-json2yaml
+++ b/tools/cfn-json2yaml
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-
#
# 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/tools/install_venv.py b/tools/install_venv.py
index 75eecec4a..b2d34d42d 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -1,4 +1,4 @@
-
+#
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 46822e329..08cd34a61 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -1,3 +1,4 @@
+#
# Copyright 2013 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
diff --git a/tools/state_transitions.py b/tools/state_transitions.py
index c03ef08df..252414d7f 100755
--- a/tools/state_transitions.py
+++ b/tools/state_transitions.py
@@ -1,5 +1,5 @@
#!/usr/bin/python
-
+#
# 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
# a copy of the License at