Repository: incubator-impala Updated Branches: refs/heads/master a9c405955 -> 0449b5bea
IMPALA-3853: squeasel is MIT (and dual copyright) not Apache Squeasel was erroneously marked Apache 2.0 in the top-level LICENSE.txt, with no copyright notice. It's actually MIT, with two copyrights. Change-Id: I9711ad60dbe00c3b8b1ce7b9ccc3ca1dd637b88c Reviewed-on: http://gerrit.cloudera.org:8080/4646 Reviewed-by: Jim Apple <jbap...@cloudera.com> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/3eb051f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/3eb051f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/3eb051f6 Branch: refs/heads/master Commit: 3eb051f6f6f2dc7697380896bbec87f1db799d76 Parents: a9c4059 Author: Jim Apple <jbap...@cloudera.com> Authored: Thu Oct 6 07:54:18 2016 -0700 Committer: Internal Jenkins <cloudera-hud...@gerrit.cloudera.org> Committed: Sun Oct 9 02:15:23 2016 +0000 ---------------------------------------------------------------------- LICENSE.txt | 26 +++++++++++++++++++++++++- be/src/thirdparty/squeasel/LICENSE | 3 ++- 2 files changed, 27 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/3eb051f6/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 98ac0d8..eb5990d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -548,7 +548,31 @@ shell/ext-py/sqlparse-0.1.14: 3-clause BSD -------------------------------------------------------------------------------- -be/src/thirdparty/squeasel: Apache 2.0 license +be/src/thirdparty/squeasel: MIT license + +Some portions Copyright (c) 2004-2013 Sergey Lyubka +Some portions Copyright (c) 2013 Cloudera Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +-------------------------------------------------------------------------------- + be/src/thirdparty/mustache: Apache 2.0 license be/src/expr/hll-bias.h: Apache 2.0 license shell/ext-py/sasl-0.1.1: Apache 2.0 license http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/3eb051f6/be/src/thirdparty/squeasel/LICENSE ---------------------------------------------------------------------- diff --git a/be/src/thirdparty/squeasel/LICENSE b/be/src/thirdparty/squeasel/LICENSE index edb1983..3747c51 100644 --- a/be/src/thirdparty/squeasel/LICENSE +++ b/be/src/thirdparty/squeasel/LICENSE @@ -1,4 +1,5 @@ -Copyright (c) 2004-2013 Sergey Lyubka +Some portions Copyright (c) 2004-2013 Sergey Lyubka +Some portions Copyright (c) 2013 Cloudera Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
