diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml index 5fdfcd3bb7..e2a5ab038d 100644 --- a/.kitchen.cloud.yml +++ b/.kitchen.cloud.yml @@ -15,13 +15,13 @@ driver_config: provisioner: name: chef_zero - require_chef_omnibus: 12.13.30 + require_chef_omnibus: 12.19.36 platforms: - - name: amazon-linux-2016-09 + - name: amazon-linux-2017-03 driver_plugin: ec2 driver_config: - image_id: ami-c481fad3 + image_id: ami-c58c1dd3 block_device_mappings: - device_name: /dev/xvda ebs: diff --git a/.kitchen.yml b/.kitchen.yml index aa41906dd4..32f150915d 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -4,7 +4,7 @@ driver: provisioner: name: chef_zero - require_chef_omnibus: 12.13.30 + require_chef_omnibus: 12.19.36 platforms: - name: centos-6.6 diff --git a/LICENSE.txt b/LICENSE.txt index 230f9d388b..d645695673 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,77 +1,202 @@ -Amazon Software License -This Amazon Software License (“License”) governs your use, reproduction, and distribution of the accompanying software -as specified below. - -1. Definitions - - “Licensor” means any person or entity that distributes its Work. - - “Software” means the original work of authorship made available under this License. - - “Work” means the Software and any additions to or derivative works of the Software that are made available under - this License. - - The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the meaning as provided under - U.S. copyright law; provided, however, that for the purposes of this License, derivative works shall not include - works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work. - - Works, including the Software, are “made available” under this License by including in or with the Work either - (a) a copyright notice referencing the applicability of this License to the Work, or (b) a copy of this License. - -2. License Grants - - 2.1 Copyright Grant. Subject to the terms and conditions of this License, each Licensor grants to you a perpetual, - worldwide, non-exclusive, royalty-free, copyright license to reproduce, prepare derivative works of, publicly - display, publicly perform, sublicense and distribute its Work and any resulting derivative works in any form. - - 2.2 Patent Grant. Subject to the terms and conditions of this License, each Licensor grants to you a perpetual, - worldwide, non-exclusive, royalty-free patent license to make, have made, use, sell, offer for sale, import, and - otherwise transfer its Work, in whole or in part. The foregoing license applies only to the patent claims licensable - by Licensor that would be infringed by Licensor’s Work (or portion thereof) individually and excluding any - combinations with any other materials or technology. - -3. Limitations - - 3.1 Redistribution. You may reproduce or distribute the Work only if (a) you do so under this License, (b) you - include a complete copy of this License with your distribution, and (c) you retain without modification any - copyright, patent, trademark, or attribution notices that are present in the Work. - - 3.2 Derivative Works. You may specify that additional or different terms apply to the use, reproduction, and - distribution of your derivative works of the Work (“Your Terms”) only if (a) Your Terms provide that the use - limitation in Section 3.3 applies to your derivative works, and (b) you identify the specific derivative works that - are subject to Your Terms. Notwithstanding Your Terms, this License (including the redistribution requirements in - Section 3.1) will continue to apply to the Work itself. - - 3.3 Use Limitation. The Work and any derivative works thereof only may be used or intended for use with the web - services, computing platforms or applications provided by Amazon.com, Inc. or its affiliates, including Amazon Web - Services, Inc. - - 3.4 Patent Claims. If you bring or threaten to bring a patent claim against any Licensor (including any claim, - cross-claim or counterclaim in a lawsuit) to enforce any patents that you allege are infringed by any Work, then - your rights under this License from such Licensor (including the grants in Sections 2.1 and 2.2) will terminate - immediately. - - 3.5 Trademarks. This License does not grant any rights to use any Licensor’s or its affiliates’ names, logos, or - trademarks, except as necessary to reproduce the notices described in this License. - - 3.6 Termination. If you violate any term of this License, then your rights under this License (including the grants - in Sections 2.1 and 2.2) will terminate immediately. - -4. Disclaimer of Warranty. - - THE WORK IS PROVIDED “AS IS” WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING - WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT. YOU BEAR - THE RISK OF UNDERTAKING ANY ACTIVITIES UNDER THIS LICENSE. SOME STATES’ CONSUMER LAWS DO NOT ALLOW EXCLUSION OF AN - IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO YOU. - -5. Limitation of Liability. - - EXCEPT AS PROHIBITED BY APPLICABLE LAW, IN NO EVENT AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING - NEGLIGENCE), CONTRACT, OR OTHERWISE SHALL ANY LICENSOR BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT, INDIRECT, - SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATED TO THIS LICENSE, THE USE OR INABILITY TO USE - THE WORK (INCLUDING BUT NOT LIMITED TO LOSS OF GOODWILL, BUSINESS INTERRUPTION, LOST PROFITS OR DATA, COMPUTER - FAILURE OR MALFUNCTION, OR ANY OTHER COMMERCIAL DAMAGES OR LOSSES), EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -Effective Date – April 18, 2008 © 2008 Amazon.com, Inc. or its affiliates. All rights reserved. \ No newline at end of file + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000000..122be6000b --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,2 @@ +cfncluster-cookbook +Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/attributes/default.rb b/attributes/default.rb index b1abb79aca..541974084b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/files/default/CfnCluster-License-README.txt b/files/default/CfnCluster-License-README.txt index 9deede369d..04370513e3 100644 --- a/files/default/CfnCluster-License-README.txt +++ b/files/default/CfnCluster-License-README.txt @@ -1,4 +1,4 @@ -CfnCluster is licensed under the Amazon Software License (http://aws.amazon.com/asl/). +CfnCluster is licensed under the Apache License 2.0 (http://aws.amazon.com/apache2.0/). CfnCluster AMIs ship with the following independent packages, which are offered under separate terms. diff --git a/files/default/configure-pat.sh b/files/default/configure-pat.sh index 9bfda96a5d..68e0b96809 100644 --- a/files/default/configure-pat.sh +++ b/files/default/configure-pat.sh @@ -2,10 +2,10 @@ # Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/files/default/setup-ephemeral-drives.sh b/files/default/setup-ephemeral-drives.sh index 1662eccf79..64e21cf98d 100644 --- a/files/default/setup-ephemeral-drives.sh +++ b/files/default/setup-ephemeral-drives.sh @@ -2,10 +2,10 @@ set -x -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/files/default/torque.setup b/files/default/torque.setup index e3f0629728..2da59ead2a 100644 --- a/files/default/torque.setup +++ b/files/default/torque.setup @@ -3,10 +3,10 @@ # Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/metadata.rb b/metadata.rb index 0f81de0377..fefda29b00 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,21 +1,21 @@ name 'cfncluster' maintainer 'Dougal Ballantyne' maintainer_email 'dougalb@amazon.com' -license 'Amazon Software License' +license 'Apache License 2.0' description 'Installs/Configures cfncluster' long_description 'Installs/Configures cfncluster' issues_url 'https://github.com/awslabs/cfncluster-cookbook/issues' source_url 'https://github.com/awslabs/cfncluster-cookbook' version '1.3.2' -depends 'build-essential', '~> 7.0.0' -depends 'poise-python', '~> 1.5.1' -depends 'tar', '~> 0.7.0' -depends 'selinux', '~> 0.9.0' -depends 'nfs', '~> 2.2.11' -depends 'yum', '~> 4.0.0' -depends 'yum-epel', '~> 1.0.1' -depends 'openssh', '~> 2.1.0' -depends 'apt', '~> 4.0.2' -depends 'hostname', '~> 0.4.0' +depends 'build-essential', '~> 8.0.2' +depends 'poise-python', '~> 1.6.0' +depends 'tar', '~> 2.0.0' +depends 'selinux', '~> 2.0.0' +depends 'nfs', '~> 2.3.1' +depends 'yum', '~> 5.0.1' +depends 'yum-epel', '~> 2.1.1' +depends 'openssh', '~> 2.4.1' +depends 'apt', '~> 6.1.0' +depends 'hostname', '~> 0.4.2' depends 'line', '~> 0.6.3' diff --git a/packer_alinux.json b/packer_alinux.json index 1edcbda609..26f1b15b6c 100644 --- a/packer_alinux.json +++ b/packer_alinux.json @@ -17,7 +17,7 @@ { "type" : "amazon-ebs", "region" : "us-east-1", - "source_ami" : "ami-c481fad3", + "source_ami" : "ami-c58c1dd3", "ami_regions" : "{{user `build_for`}}", "ami_groups" : "{{user `ami_perms`}}", "instance_type" : "{{user `instance_type`}}", diff --git a/packer_variables.json b/packer_variables.json index dbcbf1781f..494481afd3 100644 --- a/packer_variables.json +++ b/packer_variables.json @@ -1,7 +1,7 @@ { "cfncluster_version": "1.3.2", "cfncluster_cookbook_version": "1.3.2", - "chef_version": "12.13.30", - "ridley_version": "4.6.1", - "berkshelf_version": "4.3.5" + "chef_version": "12.19.36", + "ridley_version": "5.1.0", + "berkshelf_version": "5.6.4" } diff --git a/recipes/_compute_base_config.rb b/recipes/_compute_base_config.rb index 0455460d6d..ccc22ed147 100644 --- a/recipes/_compute_base_config.rb +++ b/recipes/_compute_base_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_compute_custom_config.rb b/recipes/_compute_custom_config.rb index 10adea7bee..1c6baac202 100644 --- a/recipes/_compute_custom_config.rb +++ b/recipes/_compute_custom_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_compute_openlava_config.rb b/recipes/_compute_openlava_config.rb index 8cdcb64bd4..6ecc63ff34 100644 --- a/recipes/_compute_openlava_config.rb +++ b/recipes/_compute_openlava_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_compute_sge_config.rb b/recipes/_compute_sge_config.rb index 394fcc1272..97b201c6ba 100644 --- a/recipes/_compute_sge_config.rb +++ b/recipes/_compute_sge_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_compute_slurm_config.rb b/recipes/_compute_slurm_config.rb index 970193a151..0398114b20 100644 --- a/recipes/_compute_slurm_config.rb +++ b/recipes/_compute_slurm_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_compute_torque_config.rb b/recipes/_compute_torque_config.rb index 2bdd1ca300..e0305beee2 100644 --- a/recipes/_compute_torque_config.rb +++ b/recipes/_compute_torque_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_ec2_udev_rules.rb b/recipes/_ec2_udev_rules.rb index 5db345aa79..d57346d928 100644 --- a/recipes/_ec2_udev_rules.rb +++ b/recipes/_ec2_udev_rules.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_ganglia_install.rb b/recipes/_ganglia_install.rb index dea362325d..4adbe983ee 100644 --- a/recipes/_ganglia_install.rb +++ b/recipes/_ganglia_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_master_base_config.rb b/recipes/_master_base_config.rb index 192dec25f0..7fe1f0de18 100644 --- a/recipes/_master_base_config.rb +++ b/recipes/_master_base_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_master_custom_config.rb b/recipes/_master_custom_config.rb index bb35dec2c9..bf0429c772 100644 --- a/recipes/_master_custom_config.rb +++ b/recipes/_master_custom_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_master_openlava_config.rb b/recipes/_master_openlava_config.rb index 9d8a5523a5..9d287a1cfa 100644 --- a/recipes/_master_openlava_config.rb +++ b/recipes/_master_openlava_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_master_sge_config.rb b/recipes/_master_sge_config.rb index db00cf83f1..84f882e583 100644 --- a/recipes/_master_sge_config.rb +++ b/recipes/_master_sge_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_master_slurm_config.rb b/recipes/_master_slurm_config.rb index cd5b995c0d..fa806aacb2 100644 --- a/recipes/_master_slurm_config.rb +++ b/recipes/_master_slurm_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_master_torque_config.rb b/recipes/_master_torque_config.rb index ebb9ac20d2..fc23f3fa9b 100644 --- a/recipes/_master_torque_config.rb +++ b/recipes/_master_torque_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_nvidia_install.rb b/recipes/_nvidia_install.rb index 9fccf3d3f5..be60d54aa2 100644 --- a/recipes/_nvidia_install.rb +++ b/recipes/_nvidia_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_prep_env.rb b/recipes/_prep_env.rb index 438c74fbfa..3e36f4b940 100644 --- a/recipes/_prep_env.rb +++ b/recipes/_prep_env.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_setup_python.rb b/recipes/_setup_python.rb index 7ef147bc8c..3767608b9c 100644 --- a/recipes/_setup_python.rb +++ b/recipes/_setup_python.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_undo_base_config.rb b/recipes/_undo_base_config.rb index d55e417b6f..b183f5eee3 100644 --- a/recipes/_undo_base_config.rb +++ b/recipes/_undo_base_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/_undo_master_base_config.rb b/recipes/_undo_master_base_config.rb index 0fe83e2a3e..54df4c629a 100644 --- a/recipes/_undo_master_base_config.rb +++ b/recipes/_undo_master_base_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/base_config.rb b/recipes/base_config.rb index c0a0e7f3ac..8b96a3766d 100644 --- a/recipes/base_config.rb +++ b/recipes/base_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/base_install.rb b/recipes/base_install.rb index 399c2f1671..d4c60e20f8 100644 --- a/recipes/base_install.rb +++ b/recipes/base_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/custom_config.rb b/recipes/custom_config.rb index 667e20b171..c8ba4262c1 100644 --- a/recipes/custom_config.rb +++ b/recipes/custom_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/custom_install.rb b/recipes/custom_install.rb index dcb6b39490..cfe2abeff8 100644 --- a/recipes/custom_install.rb +++ b/recipes/custom_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/default.rb b/recipes/default.rb index 0e2230b421..663ae61e09 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -4,16 +4,15 @@ # # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and # limitations under the License. include_recipe 'cfncluster::sge_install' -include_recipe 'cfncluster::openlava_install' include_recipe 'cfncluster::torque_install' include_recipe 'cfncluster::slurm_install' diff --git a/recipes/image_prep.rb b/recipes/image_prep.rb index 490d20176a..bb6a5bbdc1 100644 --- a/recipes/image_prep.rb +++ b/recipes/image_prep.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/munge_install.rb b/recipes/munge_install.rb index a5556a5c63..0c0a261751 100644 --- a/recipes/munge_install.rb +++ b/recipes/munge_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/openlava_config.rb b/recipes/openlava_config.rb index c70d4654df..f5152f7f65 100644 --- a/recipes/openlava_config.rb +++ b/recipes/openlava_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/openlava_install.rb b/recipes/openlava_install.rb index ec7fabe229..c45867c597 100644 --- a/recipes/openlava_install.rb +++ b/recipes/openlava_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/sge_config.rb b/recipes/sge_config.rb index 526be2b3b0..d2d078a4f3 100644 --- a/recipes/sge_config.rb +++ b/recipes/sge_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/sge_install.rb b/recipes/sge_install.rb index bc48d841ea..f8a4bc5c04 100644 --- a/recipes/sge_install.rb +++ b/recipes/sge_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/slurm_config.rb b/recipes/slurm_config.rb index 821cb9ea94..bc2f8d0611 100644 --- a/recipes/slurm_config.rb +++ b/recipes/slurm_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/slurm_install.rb b/recipes/slurm_install.rb index 1217590c1c..1577ca6278 100644 --- a/recipes/slurm_install.rb +++ b/recipes/slurm_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/torque_config.rb b/recipes/torque_config.rb index 4caf52d1d0..c51e4f13e5 100644 --- a/recipes/torque_config.rb +++ b/recipes/torque_config.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/recipes/torque_install.rb b/recipes/torque_install.rb index 2b9ec6f944..9961e5931c 100644 --- a/recipes/torque_install.rb +++ b/recipes/torque_install.rb @@ -4,10 +4,10 @@ # # Copyright 2013-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/templates/default/publish_pending.openlava.erb b/templates/default/publish_pending.openlava.erb index 9e4908b7d2..13976e86bb 100644 --- a/templates/default/publish_pending.openlava.erb +++ b/templates/default/publish_pending.openlava.erb @@ -2,10 +2,10 @@ # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/templates/default/publish_pending.pbspro.erb b/templates/default/publish_pending.pbspro.erb index a8d575111f..4b82aea603 100644 --- a/templates/default/publish_pending.pbspro.erb +++ b/templates/default/publish_pending.pbspro.erb @@ -2,10 +2,10 @@ # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/templates/default/publish_pending.sge.erb b/templates/default/publish_pending.sge.erb index 68cb3d739e..cbb2d29a6f 100644 --- a/templates/default/publish_pending.sge.erb +++ b/templates/default/publish_pending.sge.erb @@ -2,10 +2,10 @@ # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/templates/default/publish_pending.slurm.erb b/templates/default/publish_pending.slurm.erb index 066c7d3105..813775cbb9 100644 --- a/templates/default/publish_pending.slurm.erb +++ b/templates/default/publish_pending.slurm.erb @@ -2,10 +2,10 @@ # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/templates/default/publish_pending.torque.erb b/templates/default/publish_pending.torque.erb index 50dbc3db8b..02ab63a97c 100644 --- a/templates/default/publish_pending.torque.erb +++ b/templates/default/publish_pending.torque.erb @@ -2,10 +2,10 @@ # Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and diff --git a/templates/default/torque.setup.erb b/templates/default/torque.setup.erb index d4b877bbdb..4e40bfb030 100644 --- a/templates/default/torque.setup.erb +++ b/templates/default/torque.setup.erb @@ -3,10 +3,10 @@ # Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the # License. A copy of the License is located at # -# http://aws.amazon.com/asl/ +# http://aws.amazon.com/apache2.0/ # # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and