cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject [1/2] git commit: updated refs/heads/4.1 to 29da416
Date Fri, 05 Apr 2013 15:40:56 GMT
Updated Branches:
  refs/heads/4.1 42a2d429a -> 29da41695


Removing waf from the legal docs
Signed-off-by: Chip Childers <chip.childers@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4af768d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4af768d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4af768d4

Branch: refs/heads/4.1
Commit: 4af768d475270df4be4f1db39a591cab03ad2b9d
Parents: 0167420
Author: Chip Childers <chip.childers@gmail.com>
Authored: Fri Apr 5 16:38:56 2013 +0100
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Fri Apr 5 16:38:56 2013 +0100

----------------------------------------------------------------------
 LICENSE                                    |   64 -----------------------
 tools/whisker/LICENSE                      |   64 -----------------------
 tools/whisker/descriptor-for-packaging.xml |   24 ---------
 tools/whisker/descriptor.xml               |   24 ---------
 4 files changed, 0 insertions(+), 176 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4af768d4/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index eda9587..841c2cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -180,70 +180,6 @@ Copyright (c) 2013 The Apache Software Foundation
             
 
 This distribution contains third party resources.
-Within the . directory
-    licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
-
-            Copyright (c) 2005-2010 Thomas Nagy 
-            
-              Redistribution and use in source and binary forms, with or without
-              modification, are permitted provided that the following conditions
-              are met:
-              1. Redistributions of source code must retain the above copyright
-                 notice, this list of conditions and the following disclaimer.
-              2. Redistributions in binary form must reproduce the above copyright
-                 notice, this list of conditions and the following disclaimer in the
-                 documentation and/or other materials provided with the distribution.
-              3. Neither the name of the copyright holders nor the names of its
-                 contributors may be used to endorse or promote products derived from
-                 this software without specific prior written permission.
-             
-              THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-              AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-              IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-              ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-              LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-              CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-              SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-              INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-              CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-              ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-              THE POSSIBILITY OF SUCH DAMAGE.
-                        
-        from Thomas Nagy  http://code.google.com/p/waf/ 
-            waf 
-
-Within the awsapi directory
-    licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
-
-            Copyright (c) 2005-2010 Thomas Nagy 
-            
-              Redistribution and use in source and binary forms, with or without
-              modification, are permitted provided that the following conditions
-              are met:
-              1. Redistributions of source code must retain the above copyright
-                 notice, this list of conditions and the following disclaimer.
-              2. Redistributions in binary form must reproduce the above copyright
-                 notice, this list of conditions and the following disclaimer in the
-                 documentation and/or other materials provided with the distribution.
-              3. Neither the name of the copyright holders nor the names of its
-                 contributors may be used to endorse or promote products derived from
-                 this software without specific prior written permission.
-             
-              THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-              AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-              IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-              ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-              LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-              CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-              SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-              INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-              CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-              ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-              THE POSSIBILITY OF SUCH DAMAGE.
-                        
-        from Thomas Nagy  http://code.google.com/p/waf/ 
-            waf 
-
 Within the console-proxy/js directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4af768d4/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index c6e6ac7..5476899 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -180,70 +180,6 @@ Copyright (c) 2013 The Apache Software Foundation
             
 
 This distribution contains third party resources.
-Within the . directory
-    licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
-
-            Copyright (c) 2005-2010 Thomas Nagy 
-            
-              Redistribution and use in source and binary forms, with or without
-              modification, are permitted provided that the following conditions
-              are met:
-              1. Redistributions of source code must retain the above copyright
-                 notice, this list of conditions and the following disclaimer.
-              2. Redistributions in binary form must reproduce the above copyright
-                 notice, this list of conditions and the following disclaimer in the
-                 documentation and/or other materials provided with the distribution.
-              3. Neither the name of the copyright holders nor the names of its
-                 contributors may be used to endorse or promote products derived from
-                 this software without specific prior written permission.
-             
-              THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-              AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-              IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-              ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-              LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-              CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-              SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-              INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-              CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-              ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-              THE POSSIBILITY OF SUCH DAMAGE.
-                        
-        from Thomas Nagy  http://code.google.com/p/waf/ 
-            waf 
-
-Within the awsapi directory
-    licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
-
-            Copyright (c) 2005-2010 Thomas Nagy 
-            
-              Redistribution and use in source and binary forms, with or without
-              modification, are permitted provided that the following conditions
-              are met:
-              1. Redistributions of source code must retain the above copyright
-                 notice, this list of conditions and the following disclaimer.
-              2. Redistributions in binary form must reproduce the above copyright
-                 notice, this list of conditions and the following disclaimer in the
-                 documentation and/or other materials provided with the distribution.
-              3. Neither the name of the copyright holders nor the names of its
-                 contributors may be used to endorse or promote products derived from
-                 this software without specific prior written permission.
-             
-              THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-              AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-              IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-              ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-              LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-              CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-              SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-              INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-              CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-              ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-              THE POSSIBILITY OF SUCH DAMAGE.
-                        
-        from Thomas Nagy  http://code.google.com/p/waf/ 
-            waf 
-
 Within the console-proxy/js directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4af768d4/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index c00733b..b84c483 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2276,10 +2276,6 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
             name='The Apache Software Foundation' 
             url='http://www.apache.org/'/>  
         <organisation
-            id='person:Thomas.Nagy'
-            name='Thomas Nagy'
-            url='http://code.google.com/p/waf/'/>
-        <organisation
             id='person:Clinton.Begin'
             name='Clinton Begin'
             url='http://code.google.com/p/mybatis/' />
@@ -2448,16 +2444,6 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
     </primary-notice>
     <primary-organisation id='apache.org'/> 
-    <within dir='.'>
-        <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2005-2010 Thomas Nagy
-            </copyright-notice>
-            <by-organisation id="person:Thomas.Nagy">
-                <resource name="waf"/>
-            </by-organisation>
-        </with-license>
-    </within>
     <within dir='patches/systemvm/debian/config/etc/apache2'>
         <with-license id='ApacheLicenseVersion2'>
             <copyright-notice>
@@ -2630,16 +2616,6 @@ Copyright (c) 2012 John Resig, Jörn Zaefferer
             </by-organisation>
         </with-license>
     </within>
-    <within dir='awsapi'>
-        <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2005-2010 Thomas Nagy
-            </copyright-notice>
-            <by-organisation id="person:Thomas.Nagy">
-                <resource name="waf"/>
-            </by-organisation>
-        </with-license>
-    </within>
     <within dir='utils/src/com/cloud/utils/db'>
         <with-license id='ApacheLicenseVersion2'>
             <copyright-notice>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4af768d4/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 8e39586..a185e65 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2272,10 +2272,6 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
             name='The Apache Software Foundation' 
             url='http://www.apache.org/'/>  
         <organisation
-            id='person:Thomas.Nagy'
-            name='Thomas Nagy'
-            url='http://code.google.com/p/waf/'/>
-        <organisation
             id='person:Clinton.Begin'
             name='Clinton Begin'
             url='http://code.google.com/p/mybatis/' />
@@ -2436,16 +2432,6 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
     </primary-notice>
     <primary-organisation id='apache.org'/> 
-    <within dir='.'>
-        <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2005-2010 Thomas Nagy
-            </copyright-notice>
-            <by-organisation id="person:Thomas.Nagy">
-                <resource name="waf"/>
-            </by-organisation>
-        </with-license>
-    </within>
     <within dir='patches/systemvm/debian/config/etc/apache2'>
         <with-license id='ApacheLicenseVersion2'>
             <copyright-notice>
@@ -2618,16 +2604,6 @@ Copyright (c) 2012 John Resig, Jörn Zaefferer
             </by-organisation>
         </with-license>
     </within>
-    <within dir='awsapi'>
-        <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2005-2010 Thomas Nagy
-            </copyright-notice>
-            <by-organisation id="person:Thomas.Nagy">
-                <resource name="waf"/>
-            </by-organisation>
-        </with-license>
-    </within>
     <within dir='utils/src/com/cloud/utils/db'>
         <with-license id='ApacheLicenseVersion2'>
             <copyright-notice>


Mime
View raw message