Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix licenses that "assertain" to MM files. #455

Merged
merged 3 commits into from
Sep 12, 2018
+726 −723
Merged

Fix licenses that "assertain" to MM files. #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b1818d
fix all the things
emilymye Sep 12, 2018
554525d
Merge 4b1818d5614644c19d29203741fc8ccc9e98a002 into 59954997096f45b3f…
emilymye Sep 12, 2018
c91c1c4
Update tracked submodules -> HEAD on Wed Sep 12 22:52:58 UTC 2018
modular-magician Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions TEMPLATE_SDK.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,12 +761,12 @@ line #1 by compiling the license template:
To ensure no doubts exist on the readers' minds, we recommend that you mark the
copyright notice on the template with a ERB block:

<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
...
...
...
<% end # copyright -%>
-%>

### Determining the generated artifact "effective year"

Expand Down
2 changes: 1 addition & 1 deletion build/ansible
Open in desktop
Submodule ansible updated 3 files
+13 −10 lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate.py
+1 −1 lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py
+2 −2 test/integration/cloud-config-gcp.yml.template
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from f1bd50 to c8acdf
4 changes: 2 additions & 2 deletions products/_bundle/templates/chef/README.md.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file.
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% autogen_exception -%>

Google Cloud Platform for Chef
Expand Down
4 changes: 2 additions & 2 deletions products/_bundle/templates/puppet/README.md.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file.
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% autogen_exception -%>

Google Cloud Platform for Puppet
Expand Down
4 changes: 2 additions & 2 deletions products/bigquery/examples/puppet/dataset.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == "README.md" -%>
<%= compile 'templates/license.erb' -%>

Expand Down
4 changes: 2 additions & 2 deletions products/bigquery/examples/puppet/delete_dataset.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == "README.md" -%>
<%= compile 'templates/license.erb' -%>

Expand Down
4 changes: 2 additions & 2 deletions products/bigquery/examples/puppet/table.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == "README.md" -%>
<%= compile 'templates/license.erb' -%>

Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/address.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/backend_bucket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/backend_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_address.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_backend_bucket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_backend_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_disk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_firewall.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_forwarding_rule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_global_address.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_global_forwarding_rule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_health_check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_http_health_check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_https_health_check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_image.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_instance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% if name != 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_instance_group.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_instance_group_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_instance_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
4 changes: 2 additions & 2 deletions products/compute/examples/chef/delete_network.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if false # the license inside this if block assertains to this file -%>
<%# The license inside this block applies to this file
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
<% end -%>
-%>
<% unless name == 'README.md' -%>

<%= compile 'templates/license.erb' -%>
Expand Down
Loading