CLOUDSTACK-166 - Marking conntrackd.conf.templ as public domain

chipchilders · chipchilders · commit 220107c93e58 · 2012-09-27T14:55:52.000-04:00
diff --git a/LICENSE b/LICENSE
@@ -2398,6 +2398,12 @@ Within the patches/systemvm/debian/config/etc/ssh/ directory
             sshd_config             
 
 
+Within the patches/systemvm/debian/config/root/redundant_router directory
+    placed in the public domain
+        by The netfilter.org project  http://www.netfilter.org/ 
+            conntrackd.conf.templ
+
+
 Within the scripts/storage/secondary directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
     Copyright (c) 2010-2011 OpenStack, LLC.
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
@@ -2401,6 +2401,10 @@ this distribution.
         	id='openssh.org'
         	name='OpenSSH Project'
         	url='http://www.openssh.org/' />
+        <organisation
+        	id='netfilter.org'
+        	name='The netfilter.org project'
+        	url='http://www.netfilter.org/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
         <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2442,8 +2446,16 @@ Copyright (c) 2012 The Apache Software Foundation
             </by-organisation>
         </public-domain>
     </within>
+    <within dir='patches/systemvm/debian/config/root/redundant_router'>
+        <public-domain>
+            <by-organisation id='netfilter.org'>
+                <resource name='conntrackd.conf.templ' />
+            </by-organisation>
+        </public-domain>
+    </within>
     <within dir='patches/systemvm/debian/config/etc/ssh/'>
     	<with-license id='BSD2ClauseGeneric'>
+            <copyright-notice />
     		<by-organisation id='openssh.org'>
     			<resource name='sshd_config' />
             </by-organisation>
