Updated Branches: refs/heads/master 815009837 -> 5c924feba
Added OpenStack Swift client and Google GSON complier to the license file. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5c924feb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5c924feb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5c924feb Branch: refs/heads/master Commit: 5c924feba321d13b157497ce4c7615fd26c9473d Parents: 8150098 Author: Chip Childers <[email protected]> Authored: Mon Aug 20 15:15:58 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Mon Aug 20 15:16:32 2012 -0400 ---------------------------------------------------------------------- LICENSE | 23 +++++++++++++++- tools/whisker/descriptor.xml | 54 ++++++++++++++++++++++++------------ 2 files changed, 58 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c924feb/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 3af322b..39f8b43 100644 --- a/LICENSE +++ b/LICENSE @@ -275,6 +275,20 @@ Within the console-proxy/js directory jquery.js +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 � 2010-2011 OpenStack, LLC. + from OpenStack, LLC http://www.openstack.org + swift + + +Within the scripts/vm/hypervisor/xenserver directory + licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) + Copyright � 2010-2011 OpenStack, LLC. + from OpenStack, LLC http://www.openstack.org + swift + + Within the target/jar directory placed in the public domain by Distributed Computing Laboratory at Emory University http://creativecommons.org/licenses/publicdomain/ @@ -413,7 +427,7 @@ Within the target/jar directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com) + Copyright � 2007-2008 Trilead AG (http://www.trilead.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -1542,6 +1556,13 @@ Within the target/jar directory cloud-xstream-1.3.1.jar http://xstream.codehaus.org/repository.html +Within the tools/gcc directory + licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) + Copyright � 2009 Google Inc. + from Google Inc. http://google.com + compiler.jar + + Within the ui/lib directory placed in the public domain by Eric Meyer http://meyerweb.com/eric/ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5c924feb/tools/whisker/descriptor.xml ---------------------------------------------------------------------- diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 1b37971..402edda 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -1604,6 +1604,10 @@ Released under the MIT license by Ole Laursen, October 2009. id='jqueryui.com' name='jQuery UI Developers' url='http://jqueryui.com/about' /> + <organisation + id='openstack.org' + name='OpenStack, LLC' + url='http://www.openstack.org' /> </organisations> <primary-license id='ApacheLicenseVersion2'> <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice> @@ -1860,7 +1864,7 @@ Copyright © IBM Corp 2006 </with-license> <with-license id='BSD3ClauseGeneric'> <copyright-notice> -Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com) +Copyright © 2007-2008 Trilead AG (http://www.trilead.com) All rights reserved. </copyright-notice> <by-organisation id='trilead.com'> @@ -1879,20 +1883,34 @@ All rights reserved. </by-organisation> </public-domain> </within> -</manifest> - - - - - - - - - - - - - - - - + <within dir='scripts/storage/secondary'> + <with-license id='ApacheLicenseVersion2'> + <copyright-notice> +Copyright © 2010-2011 OpenStack, LLC. + </copyright-notice> + <by-organisation id='openstack.org'> + <resource name='swift' /> + </by-organisation> + </with-license> + </within> + <within dir='scripts/vm/hypervisor/xenserver'> + <with-license id='ApacheLicenseVersion2'> + <copyright-notice> +Copyright © 2010-2011 OpenStack, LLC. + </copyright-notice> + <by-organisation id='openstack.org'> + <resource name='swift' /> + </by-organisation> + </with-license> + </within> + <within dir='tools/gcc'> + <with-license id='ApacheLicenseVersion2'> + <copyright-notice> +Copyright © 2009 Google Inc. + </copyright-notice> + <by-organisation id='google.com'> + <resource name='compiler.jar' /> + </by-organisation> + </with-license> + </within> +</manifest>
