From af464c9afc3dc51fbdd4dc4642a997a870b5d020 Mon Sep 17 00:00:00 2001 From: Jason Dunsmore Date: Wed, 26 Feb 2014 10:30:20 -0600 Subject: [PATCH] Make the first line of every file consistent. Change-Id: I2e1a809cfca8e88693551d58d33e747f54ee5eb1 --- bin/heat-engine | 1 - bin/heat-manage | 2 +- contrib/marconi/marconi/tests/test_queue.py | 1 + contrib/rackspace/rackspace/clients.py | 1 - contrib/rackspace/rackspace/resources/auto_scale.py | 2 +- contrib/rackspace/rackspace/resources/cloud_dns.py | 1 + contrib/rackspace/rackspace/resources/cloud_server.py | 1 + contrib/rackspace/rackspace/resources/cloudnetworks.py | 1 + contrib/rackspace/rackspace/tests/test_auto_scale.py | 2 +- contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py | 2 +- contrib/rackspace/rackspace/tests/test_cloudnetworks.py | 1 + contrib/rackspace/rackspace/tests/test_rackspace_clients.py | 2 +- .../rackspace/rackspace/tests/test_rackspace_cloud_server.py | 1 + contrib/rackspace/rackspace/tests/test_rackspace_dns.py | 1 + doc/source/ext/resources.py | 1 - heat/__init__.py | 2 +- heat/api/aws/ec2token.py | 1 - heat/api/aws/exception.py | 2 +- heat/api/aws/utils.py | 1 - heat/api/cfn/__init__.py | 1 - heat/api/cfn/v1/__init__.py | 1 - heat/api/cfn/v1/signal.py | 1 - heat/api/cfn/v1/stacks.py | 1 - heat/api/cfn/versions.py | 1 - heat/api/cloudwatch/__init__.py | 1 - heat/api/cloudwatch/versions.py | 1 - heat/api/cloudwatch/watch.py | 1 - heat/api/middleware/version_negotiation.py | 1 - heat/api/openstack/__init__.py | 1 - heat/api/openstack/v1/__init__.py | 1 - heat/api/openstack/v1/actions.py | 1 - heat/api/openstack/v1/build_info.py | 1 - heat/api/openstack/v1/events.py | 1 - heat/api/openstack/v1/resources.py | 1 - heat/api/openstack/v1/software_configs.py | 1 - heat/api/openstack/v1/software_deployments.py | 1 - heat/api/openstack/v1/stacks.py | 1 - heat/api/openstack/v1/util.py | 1 - heat/api/openstack/v1/views/stacks_view.py | 1 - heat/api/openstack/v1/views/views_common.py | 1 - heat/api/openstack/versions.py | 1 - heat/cloudinit/loguserdata.py | 2 +- heat/cloudinit/part_handler.py | 2 +- heat/cmd/manage.py | 2 +- heat/common/auth_password.py | 2 +- heat/common/auth_url.py | 1 + heat/common/config.py | 2 -- heat/common/context.py | 1 - heat/common/crypt.py | 1 - heat/common/custom_backend_auth.py | 2 +- heat/common/environment_format.py | 1 - heat/common/exception.py | 2 +- heat/common/heat_keystoneclient.py | 1 - heat/common/notify.py | 1 + heat/common/plugin_loader.py | 1 - heat/common/policy.py | 2 +- heat/common/systemd.py | 1 + heat/common/template_format.py | 1 - heat/common/timeutils.py | 2 +- heat/common/urlfetch.py | 1 - heat/common/wsgi.py | 2 +- heat/db/api.py | 1 - heat/db/sqlalchemy/api.py | 1 - heat/db/sqlalchemy/filters.py | 1 - heat/db/sqlalchemy/migrate_repo/versions/015_grizzly.py | 2 +- .../db/sqlalchemy/migrate_repo/versions/016_timeout_nullable.py | 2 +- .../sqlalchemy/migrate_repo/versions/017_event_state_status.py | 2 +- .../db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py | 2 +- .../migrate_repo/versions/019_resource_action_status.py | 2 +- heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py | 2 +- heat/db/sqlalchemy/migrate_repo/versions/021_resource_data.py | 1 + .../migrate_repo/versions/022_stack_event_soft_delete.py | 2 +- .../migrate_repo/versions/023_raw_template_mysql_longtext.py | 2 +- .../sqlalchemy/migrate_repo/versions/024_event_resource_name.py | 2 +- .../migrate_repo/versions/025_user_creds_drop_service.py | 2 +- .../sqlalchemy/migrate_repo/versions/026_user_creds_drop_aws.py | 2 +- .../sqlalchemy/migrate_repo/versions/027_user_creds_trusts.py | 2 +- .../sqlalchemy/migrate_repo/versions/028_text_mysql_longtext.py | 2 +- .../db/sqlalchemy/migrate_repo/versions/029_event_id_to_uuid.py | 2 +- .../db/sqlalchemy/migrate_repo/versions/030_remove_uuidutils.py | 1 + heat/db/sqlalchemy/migrate_repo/versions/031_stack_lock.py | 2 +- heat/db/sqlalchemy/migrate_repo/versions/032_decrypt_method.py | 1 + heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py | 2 +- .../sqlalchemy/migrate_repo/versions/034_raw_template_files.py | 2 +- .../db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py | 2 +- .../migrate_repo/versions/036_stack_domain_project.py | 2 +- .../migrate_repo/versions/037_migrate_hot_template.py | 1 + .../migrate_repo/versions/038_software_config_json_config.py | 2 +- heat/db/sqlalchemy/migration.py | 1 + heat/db/sync.py | 1 - heat/db/utils.py | 1 - heat/engine/attributes.py | 1 - heat/engine/cfn/functions.py | 1 - heat/engine/clients.py | 1 - heat/engine/constraints.py | 1 - heat/engine/dependencies.py | 1 - heat/engine/environment.py | 1 - heat/engine/event.py | 1 - heat/engine/function.py | 1 - heat/engine/parameter_groups.py | 1 + heat/engine/parameters.py | 1 - heat/engine/parser.py | 1 - heat/engine/properties.py | 1 - heat/engine/resource.py | 1 - heat/engine/resources/__init__.py | 1 - heat/engine/resources/autoscaling.py | 1 - heat/engine/resources/ceilometer/alarm.py | 1 - heat/engine/resources/cloud_watch.py | 1 - heat/engine/resources/eip.py | 1 - heat/engine/resources/instance.py | 1 - heat/engine/resources/internet_gateway.py | 1 - heat/engine/resources/loadbalancer.py | 1 - heat/engine/resources/network_interface.py | 1 - heat/engine/resources/neutron/floatingip.py | 1 - heat/engine/resources/neutron/loadbalancer.py | 1 - heat/engine/resources/neutron/metering.py | 1 + heat/engine/resources/neutron/net.py | 1 - heat/engine/resources/neutron/network_gateway.py | 2 +- heat/engine/resources/neutron/neutron.py | 1 - heat/engine/resources/neutron/port.py | 1 - heat/engine/resources/neutron/router.py | 1 - heat/engine/resources/neutron/security_group.py | 1 - heat/engine/resources/neutron/subnet.py | 1 - heat/engine/resources/neutron/vpnservice.py | 1 - heat/engine/resources/nova_floatingip.py | 1 + heat/engine/resources/nova_keypair.py | 1 + heat/engine/resources/nova_utils.py | 1 - heat/engine/resources/os_database.py | 1 - heat/engine/resources/random_string.py | 1 - heat/engine/resources/resource_group.py | 1 - heat/engine/resources/route_table.py | 1 - heat/engine/resources/s3.py | 1 - heat/engine/resources/security_group.py | 1 - heat/engine/resources/server.py | 1 - heat/engine/resources/software_config/cloud_config.py | 1 - heat/engine/resources/software_config/multi_part.py | 1 - heat/engine/resources/software_config/software_config.py | 1 - heat/engine/resources/stack.py | 1 - heat/engine/resources/subnet.py | 1 - heat/engine/resources/swift.py | 1 - heat/engine/resources/template_resource.py | 1 - heat/engine/resources/user.py | 1 - heat/engine/resources/volume.py | 1 - heat/engine/resources/vpc.py | 1 - heat/engine/resources/wait_condition.py | 1 - heat/engine/scheduler.py | 1 - heat/engine/service.py | 1 - heat/engine/signal_responder.py | 1 - heat/engine/stack_lock.py | 2 +- heat/engine/stack_resource.py | 1 - heat/engine/stack_user.py | 1 - heat/engine/support.py | 1 - heat/engine/template.py | 1 - heat/engine/timestamp.py | 1 - heat/engine/update.py | 1 - heat/engine/watchrule.py | 1 - heat/openstack/common/config/generator.py | 1 + heat/openstack/common/context.py | 1 + heat/openstack/common/crypto/utils.py | 1 + heat/openstack/common/db/api.py | 1 + heat/openstack/common/db/exception.py | 1 + heat/openstack/common/db/sqlalchemy/models.py | 1 + heat/openstack/common/db/sqlalchemy/provision.py | 1 + heat/openstack/common/db/sqlalchemy/session.py | 1 + heat/openstack/common/db/sqlalchemy/test_migrations.py | 1 + heat/openstack/common/db/sqlalchemy/utils.py | 1 + heat/openstack/common/eventlet_backdoor.py | 1 + heat/openstack/common/excutils.py | 1 + heat/openstack/common/fileutils.py | 1 + heat/openstack/common/fixture/lockutils.py | 1 + heat/openstack/common/fixture/mockpatch.py | 1 + heat/openstack/common/fixture/moxstubout.py | 1 + heat/openstack/common/gettextutils.py | 1 + heat/openstack/common/importutils.py | 1 + heat/openstack/common/jsonutils.py | 1 + heat/openstack/common/local.py | 1 + heat/openstack/common/lockutils.py | 1 + heat/openstack/common/log.py | 1 + heat/openstack/common/log_handler.py | 1 + heat/openstack/common/loopingcall.py | 1 + heat/openstack/common/network_utils.py | 1 + heat/openstack/common/notifier/api.py | 1 + heat/openstack/common/notifier/list_notifier.py | 1 + heat/openstack/common/notifier/log_notifier.py | 1 + heat/openstack/common/notifier/no_op_notifier.py | 1 + heat/openstack/common/notifier/proxy.py | 1 + heat/openstack/common/notifier/rabbit_notifier.py | 1 + heat/openstack/common/notifier/rpc_notifier.py | 1 + heat/openstack/common/notifier/rpc_notifier2.py | 1 + heat/openstack/common/notifier/test_notifier.py | 1 + heat/openstack/common/policy.py | 1 + heat/openstack/common/processutils.py | 1 + heat/openstack/common/rpc/__init__.py | 1 + heat/openstack/common/rpc/amqp.py | 1 + heat/openstack/common/rpc/common.py | 1 + heat/openstack/common/rpc/dispatcher.py | 1 + heat/openstack/common/rpc/impl_fake.py | 1 + heat/openstack/common/rpc/impl_kombu.py | 1 + heat/openstack/common/rpc/impl_qpid.py | 1 + heat/openstack/common/rpc/impl_zmq.py | 1 + heat/openstack/common/rpc/matchmaker.py | 1 + heat/openstack/common/rpc/matchmaker_redis.py | 1 + heat/openstack/common/rpc/matchmaker_ring.py | 1 + heat/openstack/common/rpc/proxy.py | 1 + heat/openstack/common/rpc/serializer.py | 1 + heat/openstack/common/rpc/service.py | 1 + heat/openstack/common/rpc/zmq_receiver.py | 1 + heat/openstack/common/service.py | 1 + heat/openstack/common/sslutils.py | 1 + heat/openstack/common/strutils.py | 1 + heat/openstack/common/test.py | 1 + heat/openstack/common/threadgroup.py | 1 + heat/openstack/common/timeutils.py | 1 + heat/openstack/common/uuidutils.py | 1 + heat/openstack/common/versionutils.py | 1 + heat/rpc/client.py | 2 +- heat/tests/__init__.py | 2 +- heat/tests/common.py | 2 +- heat/tests/fakes.py | 2 +- heat/tests/generic_resource.py | 2 +- heat/tests/test_api_aws.py | 2 +- heat/tests/test_api_cfn_v1.py | 2 +- heat/tests/test_api_cloudwatch.py | 2 +- heat/tests/test_api_ec2token.py | 2 +- heat/tests/test_api_openstack_v1.py | 2 +- heat/tests/test_api_openstack_v1_util.py | 2 +- heat/tests/test_api_openstack_v1_views_stacks_view_builder.py | 2 +- heat/tests/test_api_openstack_v1_views_views_common.py | 2 +- heat/tests/test_attributes.py | 2 +- heat/tests/test_auth_password.py | 2 +- heat/tests/test_auth_url.py | 1 + heat/tests/test_autoscaling.py | 2 +- heat/tests/test_autoscaling_update_policy.py | 2 +- heat/tests/test_ceilometer_alarm.py | 2 +- heat/tests/test_clients.py | 2 +- heat/tests/test_cloudwatch.py | 2 +- heat/tests/test_common_policy.py | 1 + heat/tests/test_constraints.py | 2 +- heat/tests/test_cw_alarm.py | 2 +- heat/tests/test_dbinstance.py | 2 +- heat/tests/test_dependencies.py | 2 +- heat/tests/test_eip.py | 2 +- heat/tests/test_engine_api_utils.py | 2 +- heat/tests/test_engine_service.py | 2 +- heat/tests/test_environment.py | 1 - heat/tests/test_environment_format.py | 2 +- heat/tests/test_event.py | 2 +- heat/tests/test_exception.py | 1 + heat/tests/test_fault_middleware.py | 2 +- heat/tests/test_function.py | 2 +- heat/tests/test_heatclient.py | 2 +- heat/tests/test_hot.py | 2 +- heat/tests/test_identifier.py | 2 +- heat/tests/test_instance.py | 2 +- heat/tests/test_instance_group.py | 2 +- heat/tests/test_instance_group_update_policy.py | 2 +- heat/tests/test_instance_network.py | 2 +- heat/tests/test_iso8601_utils.py | 2 +- heat/tests/test_loadbalancer.py | 2 +- heat/tests/test_loguserdata.py | 2 +- heat/tests/test_metadata_refresh.py | 2 +- heat/tests/test_nested_stack.py | 2 +- heat/tests/test_neutron.py | 2 +- heat/tests/test_neutron_autoscaling.py | 2 +- heat/tests/test_neutron_loadbalancer.py | 2 +- heat/tests/test_neutron_metering.py | 1 + heat/tests/test_neutron_network_gateway.py | 2 +- heat/tests/test_neutron_security_group.py | 2 +- heat/tests/test_neutron_vpnservice.py | 2 +- heat/tests/test_nokey.py | 2 +- heat/tests/test_notifications.py | 1 + heat/tests/test_nova_floatingip.py | 1 + heat/tests/test_nova_keypair.py | 2 +- heat/tests/test_nova_utils.py | 1 - heat/tests/test_os_database.py | 2 +- heat/tests/test_parameters.py | 2 +- heat/tests/test_parser.py | 2 +- heat/tests/test_plugin_loader.py | 2 +- heat/tests/test_properties.py | 2 +- heat/tests/test_provider_template.py | 2 +- heat/tests/test_random_string.py | 2 +- heat/tests/test_resource.py | 2 +- heat/tests/test_resource_group.py | 1 - heat/tests/test_restarter.py | 1 + heat/tests/test_rpc_client.py | 2 +- heat/tests/test_s3.py | 2 +- heat/tests/test_scaling_template.py | 1 + heat/tests/test_scheduler.py | 2 +- heat/tests/test_security_group.py | 2 +- heat/tests/test_server.py | 2 +- heat/tests/test_server_tags.py | 2 +- heat/tests/test_short_id.py | 2 +- heat/tests/test_signal.py | 2 +- heat/tests/test_sqlalchemy_api.py | 1 + heat/tests/test_sqlalchemy_filters.py | 1 + heat/tests/test_ssl_middleware.py | 2 +- heat/tests/test_stack_lock.py | 2 +- heat/tests/test_stack_resource.py | 2 +- heat/tests/test_support.py | 2 +- heat/tests/test_swift.py | 2 +- heat/tests/test_template_format.py | 2 +- heat/tests/test_urlfetch.py | 1 - heat/tests/test_user.py | 2 +- heat/tests/test_validate.py | 2 +- heat/tests/test_version_negotiation_middleware.py | 2 +- heat/tests/test_volume.py | 2 +- heat/tests/test_vpc.py | 2 +- heat/tests/test_waitcondition.py | 2 +- heat/tests/test_watch.py | 2 +- heat/tests/test_wsgi.py | 2 +- heat/tests/utils.py | 2 +- heat/tests/v1_1/fakes.py | 1 + heat/version.py | 1 - tools/cfn-json2yaml | 1 - tools/install_venv.py | 2 +- tools/install_venv_common.py | 1 + tools/state_transitions.py | 2 +- 317 files changed, 212 insertions(+), 228 deletions(-) diff --git a/bin/heat-engine b/bin/heat-engine index 14ef7ce064..3f1e78df64 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 83d9de7748..baf26d7dbc 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 efa90252c3..1d41d65bd7 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 3dfe062106..43880f5406 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 165ac9ff34..afba063442 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 6df292570f..7f66895a49 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 215a7fef3f..eaf036de30 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 f018ecd37b..34eda6600c 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 aa387d3346..5dfee947d7 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 f7a522f38e..be20b964ca 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 b31b3cf342..c102a92a79 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 a09b5538e9..3cab7096ec 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 a343ab5cb9..7bd781383d 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 e3eafd5ff1..f44a8e0ea4 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 5d1e857d47..7e19212ec7 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 2e9772bc70..d6f921a842 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 f524cb4a20..fcde850236 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 7f5140875f..2f8dab0fa2 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 530abfa2e4..ad4114591e 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 f298e8ab83..6e294924e4 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 0ff0c5a4f2..d772b9452a 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 abfbbf4163..3e0a4e09c5 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 484170a663..9e730d3349 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 722a79b345..c92a992b3d 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 bb3f9f9101..9d36bd193a 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 722a79b345..c92a992b3d 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 ec4f3b24f9..a495bfa7ae 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 491a3331bd..5d3fdd66c2 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 081cedf994..1a2cfc1273 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 b30346410b..aba483a36f 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 23ad9e0c3f..b5b93dcefe 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 ac2c052454..dfe8b06c67 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 da3cdb1f62..fe1ace337d 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 cbe40289b2..334f286554 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 e015c15783..0ba6592522 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 a770e4f1ff..506b772c46 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 aedb4c9173..3852c2e9fb 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 0814509511..280dab4eff 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 3a494a709d..4462cfdffc 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 ab0bb037dc..cccb11030f 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 722a79b345..c92a992b3d 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 87bd1929be..9c50e95221 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 64a24b470e..e6a6ce20da 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 5f2d3e64a4..e3821efca3 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 723fcfc1ae..c6c07affdb 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 4bb825303d..d588700aa7 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 9ebf2b714a..0daebbd088 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 8a82afa62f..1e0a91ee09 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 c87678f93e..7bf3b6d646 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 d57de40fca..28ef3d4ba8 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 31786c0e2d..ea7fe2cbdb 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 5ede75bd8b..c4990a17f9 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 15ec44348c..1dcf82c9c4 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 d168482c40..edc37131e3 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 aa45f76bc8..3b74b8f920 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 6468742ce0..179c854cbb 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 f094dd7778..1eb7bfa578 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 54e496f86e..6e79060554 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 82add4d840..2249cbac64 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 9892103f1a..6417e35114 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 557224f34a..fd874eed4b 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 a0623e3e07..c57daedb86 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 7557604d3f..830934a9ee 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 f91b57e3d9..959ede8593 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 f2c7925cb2..cdbb4c7515 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 3f4905fa94..54c6cb4630 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 602cfd4add..dac4951193 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 7fc1292137..e30f7c3606 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 892bdb4fb9..f56a8d5ec2 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 0da3d27037..7820b65f3d 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 733336c642..23166b5fe2 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 2491ed0d68..f779a77f96 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 17e9ba374f..5ac0cc9d34 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 642b0f9c88..02cdd87d1e 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 24db8e9ea5..818f9fb950 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 e67309c063..ce4aaf00e8 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 c3e73bd4a3..647c6bc741 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 b5870af1da..d9c5e88d62 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 7f070e199e..790f109b61 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 76edd68f65..d4db9676cd 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 f40cff47c9..ab44e96ba1 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 cdfc4313b2..a96f40acf7 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 a7a04a234c..593a62b03a 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 27901921a9..84602a2fd1 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 e468f767cc..e9e7218d4e 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 5f39e77cab..c1babaf0ee 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 6df66df576..2f8eb24017 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 e0c3761563..fe9f3187e8 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 813416080e..c3c613b66d 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 6d4013b6ee..82f80cac05 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 eb5b8b1706..9b588997cf 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 f4b0a5bbf5..4418c8cafc 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 9645394367..d77f2bfdd3 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 7d8448bbbf..e71b696e54 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 995accda7d..49da0c5530 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 bba3c83510..5dfd3cbbae 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 37e0e0a0e0..549ab162b1 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 802400ed2e..930dc10fd0 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 2f48ff2e82..2529de14f2 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 fb6ef8a3d0..82839078cf 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 32db4b995c..76c22366e3 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 0b6e3897ca..49180d7326 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 a77774bec0..12e42a99c0 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 9e8fdad9cf..181603b9ee 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 b6041535c2..c839066200 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 0593549675..288a5186e1 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 a0b92863e4..ecef1ecd90 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 9470625ccb..782f71531b 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 0808d36984..f8b5b5aa01 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 c1220ed07c..dc81897843 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 51d82cbde9..fbf66043eb 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 14b4c59165..3b5867abe4 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 4ae63b63f2..41a7c13d2a 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 b884427ff3..e2505ec212 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 d12fa0db6b..c932696c27 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 f97adc6c8f..247dd0e02d 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 e5cc802cb9..58756cc734 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 9d52af4954..bf347ca44e 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 0b586c6ba6..7849973055 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 6a4ae7ba7d..004de03467 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 0b6b4a6d71..211061db2e 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 adeae25771..f4937703ae 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 7561e68279..6b9fcd535e 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 8a9047b586..3fc8e5e2b0 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 aa01a6bafa..a5bac9dfc9 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 1827be901f..66b8a25a05 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 6735edc004..61599eb3b4 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 476962360a..a30a803cca 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 fc7d2af465..371d1e7fda 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 edc54092d0..143b24da1a 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 af8c7e2ea0..b656caf677 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 bde3cc7b03..d38ba09598 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 6cf369aeae..12c6e7c8f1 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 810bb0ee6f..e88282bdd6 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 c3c87ce5db..fa7a4de08f 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 d1bb11a72f..d3b742c1c5 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 fc3ac72be0..beca62de29 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 acc5ce324c..e17561088d 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 1e8e4316cb..7f11e793e0 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 f5a3e944cf..cac5c9f56c 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 8fb6e94271..e7e7b5dbe9 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 7ca6678ee3..61338918bd 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 03f3ed6811..8e21e57cc8 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 ee8538b006..354167bb35 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 ddad74e61c..f4d67c9eaf 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 0bd89e0047..6a752e47e6 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 198645e241..ac0fe60c6d 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 503d9105b5..c8e8a8a426 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 99abfa1dc9..bddfb8908e 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 83d1c77f68..465879183e 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 e75f671ddc..9b6b7e5864 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 c1efc9dbcc..10d3001d11 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 1f4962e606..2cbccf77b1 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 931612f857..808689cc50 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 1e0c94478b..c9d96c2a9c 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 4abda92eb5..a797a94b8a 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 f14afbdd3f..852e549b14 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 182b044365..0504323a0e 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 5bf0bb66f3..e80e3b77b9 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 d4f7333d09..9c8ff8b0d1 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 27987c57b6..29934548a8 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 c5bb2b1ed7..b4213c60be 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 2df864c141..b5485ccdb3 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 83a00a3e67..011c98447f 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 949e75d0ca..9372e14144 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 b322bc08ec..d41bc6d78e 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 7640e22989..fc9cbd2256 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 cc4c2c5ff9..f3c538adbf 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 a7932f06a3..59e783f63b 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 1b6d17aa94..48e13e08ac 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 858e77cd06..03006c503e 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 e8c031f08a..6c0d8c4bac 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 20fe89b90c..b97bb66c84 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 4fd9ae2bc2..e8db06d260 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 14d5ea5a70..a3926b2a9d 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 0819d5b97c..f153773d97 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 6c2d34039e..a8fb94dfb6 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 4315677915..2abf805577 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 1de7d3f2d7..58cfc194b6 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 f74796ba35..fef0adfff9 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 ad5d3635ab..3406c91892 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 99903e1565..82a8fab827 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 abe40e7cf3..b4d145c5c0 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 bd5e87e87d..30be2e3aa6 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 13d946e362..4d119edcc1 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 e311943708..6fe1cdb1a3 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 74785c071d..39b9d05eff 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 c9db51b56f..6ba4482777 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 71822dce40..e4b5cbc8ee 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 11fc21fc31..cd619a48a3 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 396d691807..01e1a2f914 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 313f5a9932..525ae78743 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 efacdcf985..8cd4f2da5e 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 6b7a954bce..84775ccbeb 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 b475bfca28..49ea2f459a 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 7171c4d384..74140c85b2 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 da215919bf..cbc4d4c631 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 af00b3ffe5..6500d0dfd7 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 14baceab34..0eb1e4e90a 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 e10b768361..9ab15c3eab 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 e27e5305e0..7dbb0228d3 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 75a771fe8f..929d21f237 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 6af718d778..53b7b1ceb5 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 8ea5ac379b..cd671ee773 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 9bc6e2a3a0..14f7e4909c 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 f419d11456..8f1434de23 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 799b3c7e8e..d3847eb294 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 10dfdbda42..955e3c2c3f 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 8cddf8aa7c..d6255943be 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 a552504d22..4544ac72c7 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 1165c9d13f..3da65e17dc 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 176360a3b4..65a3c38a00 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 52688a0268..60fcb0fa86 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 234b880c99..ac6694dd69 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 421652b2ca..548873492d 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 8f883765dc..42f6c3201e 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 44ecb97cc5..2a4c3f68ea 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 adaac4e7fc..20c1496720 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 a8690faa1a..1666e9c56a 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 c3c8d86e26..2c1cb2e3f1 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 bbec7db35f..c58363bffe 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 fcaa43fadf..25ce1897c4 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 13a4f7ef56..f53e93eaf5 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 58d38443c6..b7f5bb6833 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 a12d4b301d..9b6c603005 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 8208b512cd..fa143debea 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 d73b29343f..4f9bdb35a6 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 6b97bd9e89..6d83a97103 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 2e8dbf8766..0f929cd83c 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 015c5a3800..3b8b7a0f64 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 dc0483a45b..19dde90905 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 25ba72c4c7..7bdcb3cb35 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 83723d95b3..cd0923d9c7 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 123a1ea2e0..34a324d4cd 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 e2f67556d5..dbba5735f1 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 2624f66562..34af2d3e33 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 461010ed05..a95dcdaf72 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 9603519594..ec2c719ba9 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 3dea10a054..947a778402 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 bd3cd79f5a..0d2502c34c 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 0d37b515b4..4d56bbbb09 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 dcb9eb6cd3..9cbb1bd794 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 4b588c2f07..759d562b82 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 beac5b85e2..ab8810d038 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 a78593c822..3854db1adc 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 9807da5619..75d975d93f 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 bfb731fea2..998f392e6b 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 fe2afa34d5..f15b5b3a2a 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 93bdd86291..ce82904af4 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 e0d2241b3c..9b5176d37d 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 a2171b16c8..d28ebe9ad8 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 f9fe1bd6e9..8f97730ab7 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 d913edbdac..41991074e4 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 859f214e96..6a2e364dc3 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 d08f475249..3123e45584 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 5428621432..2e6cc8259a 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 0aa3fc7b51..7c06519108 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 4a91ec36b6..cf4844f383 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 0871b24883..38bc6cfcb5 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 54cd50c167..10641494b3 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 eaa0005c0e..ce1b87b2af 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 a555e9dd31..e6ce69e3bf 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 91259619e1..344356e73f 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 470fff12e8..684b23a32d 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 f8a0164c52..9e9d4efbab 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 1df342ccdc..6d3b5aac01 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 06a48b71d7..e00e90782b 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 216f887645..ccd260922e 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 a023c457e4..f7515fdc1f 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 4a8aa3da1b..38c1d4afa3 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 d1acf303fd..a7b7540e68 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 97528b8fd9..15bdc9a665 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 cd988b32c0..4a7f4b167d 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 e09e2ad8af..f913e150d8 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 8c63df8496..a7b884c62d 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 6ad54c6ce9..9a5b5073d0 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 a4d88c463c..4f0cf7ba2c 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 37e8dd6fb2..e41f8d574c 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 261ae0a450..722c5ad053 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 2ae10175bc..a55719d75f 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 baa27a4ca7..5354dee223 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 ae53c62bec..29fa353b86 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 3d8cfbb5b9..40de68d31a 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 5a64e8f37b..43f5e24fc0 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 ebad18dff3..0858288758 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 3b72881afc..c4366f24a2 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 a1957158b0..a28f2e160b 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 79bff23b79..cef2534774 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 ca37cec62d..5e8a963ca5 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 d7ac283668..b4afe020b3 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 e0f10f8893..80bb2671b2 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 25be5310af..219b72b51f 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 e748e91326..dc671b85ed 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 5f4d33e9a3..93ee2332a1 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 b93e1b4cb1..b19672282b 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 cee59b5361..1a05e1497d 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 f7d88b0208..1e87434dca 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 afb8e1fc85..d11111ed98 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 e3f9d03783..6b8e46ff48 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 088be5460f..10d5ff857b 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 45ea1a04ba..a4f653472a 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 f113b53b0d..bb54e70d1d 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 23fabd8588..ee421dca1c 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 01da0356f9..14b8acfcad 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 409f6df08b..c873843ec0 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 bcc7d7fb2b..6aef78b018 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 2abd58b035..b1afb5af90 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 2e690387f5..59b7403f6b 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 bc1c4d7cef..dd89a1446d 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 4a14f3c8e8..f729370ee6 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 0b5f42e5f4..fe99a2f38e 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 b88b7d0135..8a99259202 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 4a2b021306..a8cd2d7dcf 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 46ecedd05f..ec2f371a7c 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 75eecec4ae..b2d34d42d2 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 46822e3293..08cd34a617 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 c03ef08dfe..252414d7f4 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