Skip to content

Commit 5c924fe

Browse files
chipchilderschipchilders
committed
Added OpenStack Swift client and Google GSON complier to the license file.
1 parent 8150098 commit 5c924fe

2 files changed

Lines changed: 58 additions & 19 deletions

File tree

‎LICENSE‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,20 @@ Within the console-proxy/js directory
275275
jquery.js
276276

277277

278+
Within the scripts/storage/secondary directory
279+
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
280+
Copyright � 2010-2011 OpenStack, LLC.
281+
from OpenStack, LLC http://www.openstack.org
282+
swift
283+
284+
285+
Within the scripts/vm/hypervisor/xenserver directory
286+
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
287+
Copyright � 2010-2011 OpenStack, LLC.
288+
from OpenStack, LLC http://www.openstack.org
289+
swift
290+
291+
278292
Within the target/jar directory
279293
placed in the public domain
280294
by Distributed Computing Laboratory at Emory University http://creativecommons.org/licenses/publicdomain/
@@ -413,7 +427,7 @@ Within the target/jar directory
413427

414428
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
415429

416-
Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com)
430+
Copyright � 2007-2008 Trilead AG (http://www.trilead.com)
417431
All rights reserved.
418432

419433
Redistribution and use in source and binary forms, with or without
@@ -1542,6 +1556,13 @@ Within the target/jar directory
15421556
cloud-xstream-1.3.1.jar http://xstream.codehaus.org/repository.html
15431557

15441558

1559+
Within the tools/gcc directory
1560+
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
1561+
Copyright � 2009 Google Inc.
1562+
from Google Inc. http://google.com
1563+
compiler.jar
1564+
1565+
15451566
Within the ui/lib directory
15461567
placed in the public domain
15471568
by Eric Meyer http://meyerweb.com/eric/

‎tools/whisker/descriptor.xml‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,6 +1604,10 @@ Released under the MIT license by Ole Laursen, October 2009.
16041604
id='jqueryui.com'
16051605
name='jQuery UI Developers'
16061606
url='http://jqueryui.com/about' />
1607+
<organisation
1608+
id='openstack.org'
1609+
name='OpenStack, LLC'
1610+
url='http://www.openstack.org' />
16071611
</organisations>
16081612
<primary-license id='ApacheLicenseVersion2'>
16091613
<copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -1860,7 +1864,7 @@ Copyright © IBM Corp 2006
18601864
</with-license>
18611865
<with-license id='BSD3ClauseGeneric'>
18621866
<copyright-notice>
1863-
Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com)
1867+
Copyright © 2007-2008 Trilead AG (http://www.trilead.com)
18641868
All rights reserved.
18651869
</copyright-notice>
18661870
<by-organisation id='trilead.com'>
@@ -1879,20 +1883,34 @@ All rights reserved.
18791883
</by-organisation>
18801884
</public-domain>
18811885
</within>
1882-
</manifest>
1883-
1884-
1885-
1886-
1887-
1888-
1889-
1890-
1891-
1892-
1893-
1894-
1895-
1896-
1897-
1898-
1886+
<within dir='scripts/storage/secondary'>
1887+
<with-license id='ApacheLicenseVersion2'>
1888+
<copyright-notice>
1889+
Copyright © 2010-2011 OpenStack, LLC.
1890+
</copyright-notice>
1891+
<by-organisation id='openstack.org'>
1892+
<resource name='swift' />
1893+
</by-organisation>
1894+
</with-license>
1895+
</within>
1896+
<within dir='scripts/vm/hypervisor/xenserver'>
1897+
<with-license id='ApacheLicenseVersion2'>
1898+
<copyright-notice>
1899+
Copyright © 2010-2011 OpenStack, LLC.
1900+
</copyright-notice>
1901+
<by-organisation id='openstack.org'>
1902+
<resource name='swift' />
1903+
</by-organisation>
1904+
</with-license>
1905+
</within>
1906+
<within dir='tools/gcc'>
1907+
<with-license id='ApacheLicenseVersion2'>
1908+
<copyright-notice>
1909+
Copyright © 2009 Google Inc.
1910+
</copyright-notice>
1911+
<by-organisation id='google.com'>
1912+
<resource name='compiler.jar' />
1913+
</by-organisation>
1914+
</with-license>
1915+
</within>
1916+
</manifest>

0 commit comments

Comments
 (0)