diff --git a/LICENSE b/LICENSE index 80464bec963..0254d224c2e 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. diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 173c7733d5a..14f0c96811e 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/' /> + Copyright (c) 2012 The Apache Software Foundation @@ -2442,8 +2446,16 @@ Copyright (c) 2012 The Apache Software Foundation + + + + + + + +