apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added OpenStack Swift client and Google GSON complier to the license file.

Browse Source
This commit is contained in:
Chip Childers 2012-08-20 15:15:58 -04:00
parent 8150098372
commit 5c924feba3
2 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
LICENSE
View File

@ -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/

52
tools/whisker/descriptor.xml
View File

@ -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>
<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>