From 0f5349336a08818dab6e0b36bac913bd948c9415 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 20 Feb 2013 04:36:10 +0000 Subject: [PATCH] Restore previously inapplicable sentence from ASF. * modules/openstack_project/files/gerrit/cla.html: At the request of Jonathan Bryce, Executive Director for the OpenStack Foundation, this change updates the OpenStack Project Individual Contributor License Agreement with a "public benefit" statement taken from the Apache Software Foundation's ICLA. This sentence was previously inapplicable under OpenStack LLC but can now be restored under the OpenStack Foundation. Change-Id: I944e1d361af8f0faaed0dc88ded216451b72e4b3 Reviewed-on: https://review.openstack.org/22396 Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- modules/openstack_project/files/gerrit/cla.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/openstack_project/files/gerrit/cla.html b/modules/openstack_project/files/gerrit/cla.html index 5c73778130..0d32278bb8 100644 --- a/modules/openstack_project/files/gerrit/cla.html +++ b/modules/openstack_project/files/gerrit/cla.html @@ -9,9 +9,10 @@ This is the current OpenStack Project Individual Contributor License Agreement reformatted for HTML from the original "RevisedCLA.doc" with SHA1 sum 0467dd893d276cefde614e063a363b995d67e5ee provided by Jonathan Bryce, Executive Director on behalf of The OpenStack Foundation on Monday, January 7, 2013. No -textual content was changed, except to replace quote marks with their strict -ASCII equivalentsand add the original LLC CLA text as a block quote at his -direction. +textual content was changed except to replace quote marks with their strict +ASCII equivalents, add the original LLC CLA text as a block quote, and restore +a previously inapplicable statement (sentence #2 of paragraph #2) adapted from +the Apache Software Foundation ICLA at his direction. -->

@@ -33,10 +34,12 @@ records.

You accept and agree to the following terms and conditions for Your present and -future Contributions submitted to the Project Manager. Except for the license -granted herein to the Project Manager and recipients of software distributed by -the Project Manager, You reserve all right, title, and interest in and to Your -Contributions. +future Contributions submitted to the Project Manager. In return, the Project +Manager shall not use Your Contributions in a way that is contrary to the +public benefit or inconsistent with its nonprofit status and bylaws in effect +at the time of the Contribution. Except for the license granted herein to the +Project Manager and recipients of software distributed by the Project Manager, +You reserve all right, title, and interest in and to Your Contributions.