Make the first line of every file consistent.

Change-Id: I2e1a809cfca8e88693551d58d33e747f54ee5eb1
2014-02-26 10:30:20 -06:00 · 2014-02-26 10:30:20 -06:00 · af464c9afc
commit af464c9afc
parent 97135cbfc0
317 changed files with 212 additions and 228 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/heat/init.py
+++ b/heat/init.py
@ -1,4 +1,4 @@
-
+#
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
 #
--- 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
--- 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.
 #
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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");
--- 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");
--- 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
--- 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
--- 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
--- 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");
--- 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
--- 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.
 #
--- 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
--- 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
--- 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
--- a/heat/common/policy.py
+++ b/heat/common/policy.py
@ -1,4 +1,4 @@
-
+#
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- 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
--- 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
--- 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
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More