You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2012/10/17 10:50:12 UTC
[47/50] [abbrv] git commit: CLOUDSTACK-147 - Adding rsyslog.conf to
the public domain in our legal docs
CLOUDSTACK-147 - Adding rsyslog.conf to the public domain in our legal docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/39e4c60f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/39e4c60f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/39e4c60f
Branch: refs/heads/regions
Commit: 39e4c60f3aaf751676b7e8dbbddabf011d7233a8
Parents: f212177
Author: Chip Childers <ch...@gmail.com>
Authored: Mon Oct 1 12:34:46 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Mon Oct 1 12:34:46 2012 -0400
----------------------------------------------------------------------
LICENSE | 2 ++
tools/whisker/descriptor.xml | 7 +++++++
2 files changed, 9 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39e4c60f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 96952ec..d43769f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2350,6 +2350,8 @@ Within the deps/awsapi-lib directory
Within the patches/systemvm/debian/config/etc directory
placed in the public domain
+ by Adiscon GmbH http://www.adiscon.com/
+ rsyslog.conf
by Simon Kelley
dnsmasq.conf
vpcdnsmasq.conf
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39e4c60f/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 0564d30..007535d 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2409,6 +2409,10 @@ this distribution.
id='libvirt.org'
name='The libvirt project'
url='http://libvirt.org/' />
+ <organisation
+ id='adiscon.com'
+ name='Adiscon GmbH'
+ url='http://www.adiscon.com/' />
</organisations>
<primary-license id='ApacheLicenseVersion2'>
<copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2444,6 +2448,9 @@ Copyright (c) 2012 The Apache Software Foundation
</within>
<within dir='patches/systemvm/debian/config/etc'>
<public-domain>
+ <by-organisation id='adiscon.com'>
+ <resource name='rsyslog.conf' />
+ </by-organisation>
<by-organisation id='person:simon.kelley'>
<resource name='vpcdnsmasq.conf' />
<resource name='dnsmasq.conf' />