You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/28 02:24:19 UTC
[3/10] git commit: CLOUDSTACK-166 - Marking conntrackd.conf.templ as
public domain
CLOUDSTACK-166 - Marking conntrackd.conf.templ as public domain
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/632494d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/632494d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/632494d4
Branch: refs/heads/4.0
Commit: 632494d4a312405fc4f18eba28e8b610db04ada9
Parents: 68f377e
Author: Chip Childers <ch...@gmail.com>
Authored: Thu Sep 27 14:55:42 2012 -0400
Committer: Edison Su <su...@gmail.com>
Committed: Thu Sep 27 17:23:29 2012 -0700
----------------------------------------------------------------------
LICENSE | 6 ++++++
tools/whisker/descriptor.xml | 12 ++++++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/632494d4/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 80464be..0254d22 100644
--- 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.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/632494d4/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 173c773..14f0c96 100644
--- 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>