Updated Branches: refs/heads/master d7508a4ce -> 220107c93
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/220107c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/220107c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/220107c9 Branch: refs/heads/master Commit: 220107c93e58e24b0edb6f667d497591b5df276d Parents: d7508a4 Author: Chip Childers <[email protected]> Authored: Thu Sep 27 14:55:42 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Thu Sep 27 14:55:52 2012 -0400 ---------------------------------------------------------------------- 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/220107c9/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/220107c9/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>
