Skip to content

Commit a1bd6d7

Browse files
author
Alex Huang
committed
Merge branch 'master' into javelin
2 parents 65f1991 + f26929b commit a1bd6d7

30 files changed

Lines changed: 629 additions & 6062 deletions

File tree

LICENSE

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ Within the deps/awsapi-lib directory
375375
cloud-gson.jar http://code.google.com/p/google-gson/
376376

377377
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
378-
$license.CopyrightNotice
378+
379379
from Json.simple Project http://code.google.com/p/json-simple/
380380
json_simple-1.1.jar http://code.google.com/p/json-simple/source/checkout
381381

@@ -2368,7 +2368,8 @@ Within the target/jar directory
23682368
cloud-backport-util-concurrent-3.0.jar
23692369

23702370
licensed under the Apache License, Version 1.1 http://www.apache.org/licenses/LICENSE-1.1 (as follows)
2371-
2371+
2372+
Copyright � 2012 The Apache Software Foundation
23722373

23732374
/* ====================================================================
23742375
* The Apache Software License, Version 1.1
@@ -2462,11 +2463,42 @@ Within the target/jar directory
24622463
cloud-google-gson-1.7.1.jar http://code.google.com/p/google-gson/
24632464

24642465
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
2465-
$license.CopyrightNotice
2466+
24662467
from Jetty Committers http://jetty.codehaus.org/jetty/
24672468
jetty-6.1.26.jar http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar
24682469
jetty-util-6.1.26.jar http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar
24692470

2471+
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
2472+
2473+
Copyright � 2009, Caringo, Inc.
2474+
2475+
Redistribution and use in source and binary forms, with or without
2476+
modification, are permitted provided that the following conditions
2477+
are met:
2478+
1. Redistributions of source code must retain the above copyright
2479+
notice, this list of conditions and the following disclaimer.
2480+
2. Redistributions in binary form must reproduce the above copyright
2481+
notice, this list of conditions and the following disclaimer in the
2482+
documentation and/or other materials provided with the distribution.
2483+
3. Neither the name of the copyright holders nor the names of its
2484+
contributors may be used to endorse or promote products derived from
2485+
this software without specific prior written permission.
2486+
2487+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2488+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2489+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2490+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
2491+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2492+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2493+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2494+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2495+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2496+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2497+
THE POSSIBILITY OF SUCH DAMAGE.
2498+
2499+
from Caringo, Inc. http://www.caringo.com/
2500+
CAStorSDK.jar http://www.castor.org/download.html
2501+
24702502
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
24712503

24722504
Copyright � 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
@@ -4118,7 +4150,8 @@ Within the ui/lib/jquery-ui directory
41184150

41194151
Within the ui/lib/qunit directory
41204152
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
4121-
4153+
4154+
Copyright � 2012 John Resig, J�rn Zaefferer
41224155

41234156
Permission is hereby granted, free of charge, to any person obtaining
41244157
a copy of this software and associated documentation files (the

0 commit comments

Comments
 (0)