aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2014-11-05 14:38:43 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-11-05 14:38:43 -0800
commit4c42986cc070d9c5c55c7bf8a2a67585967b1082 (patch)
tree0c20263f4d5b7cca3be13e3f9a160e2eb8014a63 /LICENSE
parent5b3b6f6f5f029164d7749366506e142b104c1d43 (diff)
downloadspark-4c42986cc070d9c5c55c7bf8a2a67585967b1082.tar.gz
spark-4c42986cc070d9c5c55c7bf8a2a67585967b1082.tar.bz2
spark-4c42986cc070d9c5c55c7bf8a2a67585967b1082.zip
[SPARK-4242] [Core] Add SASL to external shuffle service
Does three things: (1) Adds SASL to ExternalShuffleClient, (2) puts SecurityManager in BlockManager's constructor, and (3) adds unit test. Author: Aaron Davidson <aaron@databricks.com> Closes #3108 from aarondav/sasl-client and squashes the following commits: 48b622d [Aaron Davidson] Screw it, let's just get LimitedInputStream 3543b70 [Aaron Davidson] Back out of pom change due to unknown test issue? b58518a [Aaron Davidson] ByteStreams.limit() not available :( cbe451a [Aaron Davidson] Address comments 2bf2908 [Aaron Davidson] [SPARK-4242] [Core] Add SASL to external shuffle service
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE21
1 files changed, 20 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index f1732fb47a..3c667bf450 100644
--- a/LICENSE
+++ b/LICENSE
@@ -754,7 +754,7 @@ SUCH DAMAGE.
========================================================================
-For Timsort (core/src/main/java/org/apache/spark/util/collection/Sorter.java):
+For Timsort (core/src/main/java/org/apache/spark/util/collection/TimSort.java):
========================================================================
Copyright (C) 2008 The Android Open Source Project
@@ -772,6 +772,25 @@ limitations under the License.
========================================================================
+For LimitedInputStream
+ (network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java):
+========================================================================
+Copyright (C) 2007 The Guava Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+========================================================================
BSD-style licenses
========================================================================