You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2017/03/09 22:45:41 UTC
[2/2] kudu git commit: Fix RAT issues for 1.3 release
Fix RAT issues for 1.3 release
* x509_check_host.{cc,h} were moved from kudu/util to kudu/security.
This updates the corresponding RAT excludes.
* Slight formatting fix in LICENSE.txt
* Add missing ASF header to all_types-scan-correctness-test.cc and
jepsen NTP configuration
* Add Negotiator.java to RAT exclude (its original provenance is
OpenTSDB, but it got renamed from SecureRpcHelper during this release,
so the original exclude needed to be updated).
Change-Id: I23afc5acaa7543e6f777be9d8cbc247f2bbc1f22
Reviewed-on: http://gerrit.cloudera.org:8080/6330
Reviewed-by: Alexey Serbin <as...@cloudera.com>
Tested-by: Kudu Jenkins
(cherry picked from commit fc50b98aafd960d09c81d2837816285a4a0cf86d)
Reviewed-on: http://gerrit.cloudera.org:8080/6332
Reviewed-by: Todd Lipcon <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/568cf663
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/568cf663
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/568cf663
Branch: refs/heads/branch-1.3.x
Commit: 568cf663cfff67cdd780237ed78a4d1c8b69b56f
Parents: b733b46
Author: Todd Lipcon <to...@apache.org>
Authored: Thu Mar 9 11:26:52 2017 -0800
Committer: Todd Lipcon <to...@apache.org>
Committed: Thu Mar 9 21:42:06 2017 +0000
----------------------------------------------------------------------
LICENSE.txt | 2 +-
build-support/release/rat_exclude_files.txt | 6 +++---
java/kudu-jepsen/resources/ntp.conf.server | 17 +++++++++++++++++
src/kudu/tablet/all_types-scan-correctness-test.cc | 16 ++++++++++++++++
4 files changed, 37 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/568cf663/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index c5ce08d..40337bf 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -408,7 +408,7 @@ under the following 3-clause BSD license:
src/kudu/util/x509_check_host.*: OpenSSL software license:
-LICENSE ISSUES
+ LICENSE ISSUES
==============
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
http://git-wip-us.apache.org/repos/asf/kudu/blob/568cf663/build-support/release/rat_exclude_files.txt
----------------------------------------------------------------------
diff --git a/build-support/release/rat_exclude_files.txt b/build-support/release/rat_exclude_files.txt
index 6dbcb4f..ea13868 100644
--- a/build-support/release/rat_exclude_files.txt
+++ b/build-support/release/rat_exclude_files.txt
@@ -20,10 +20,10 @@ java/kudu-client/src/main/java/org/apache/kudu/client/HasFailedRpcException.java
java/kudu-client/src/main/java/org/apache/kudu/client/InvalidResponseException.java
java/kudu-client/src/main/java/org/apache/kudu/client/KuduException.java
java/kudu-client/src/main/java/org/apache/kudu/client/KuduRpc.java
+java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
java/kudu-client/src/main/java/org/apache/kudu/client/NonRecoverableException.java
java/kudu-client/src/main/java/org/apache/kudu/client/PleaseThrottleException.java
java/kudu-client/src/main/java/org/apache/kudu/client/RecoverableException.java
-java/kudu-client/src/main/java/org/apache/kudu/client/SecureRpcHelper.java
java/kudu-client/src/main/java/org/apache/kudu/client/TabletClient.java
java/kudu-client/src/test/resources/flags
python/MANIFEST.in
@@ -142,6 +142,8 @@ src/kudu/gutil/threading/thread_collision_warner.h
src/kudu/gutil/utf/rune.c
src/kudu/gutil/utf/utf.h
src/kudu/gutil/utf/utfdef.h
+src/kudu/security/x509_check_host.cc
+src/kudu/security/x509_check_host.h
src/kudu/twitter-demo/example-deletes.txt
src/kudu/twitter-demo/example-tweets.txt
src/kudu/util/cache.h
@@ -160,8 +162,6 @@ src/kudu/util/slice.h
src/kudu/util/status-test.cc
src/kudu/util/status.cc
src/kudu/util/status.h
-src/kudu/util/x509_check_host.cc
-src/kudu/util/x509_check_host.h
src/kudu/util/debug/trace_event.h
src/kudu/util/debug/trace_event_impl.cc
src/kudu/util/debug/trace_event_impl.h
http://git-wip-us.apache.org/repos/asf/kudu/blob/568cf663/java/kudu-jepsen/resources/ntp.conf.server
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/resources/ntp.conf.server b/java/kudu-jepsen/resources/ntp.conf.server
index aeac471..6657f10 100644
--- a/java/kudu-jepsen/resources/ntp.conf.server
+++ b/java/kudu-jepsen/resources/ntp.conf.server
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
enable calibrate
server 127.127.1.0 burst iburst minpoll 4 maxpoll 4
fudge 127.127.1.0 stratum 10
http://git-wip-us.apache.org/repos/asf/kudu/blob/568cf663/src/kudu/tablet/all_types-scan-correctness-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/all_types-scan-correctness-test.cc b/src/kudu/tablet/all_types-scan-correctness-test.cc
index 2bce777..9f98730 100644
--- a/src/kudu/tablet/all_types-scan-correctness-test.cc
+++ b/src/kudu/tablet/all_types-scan-correctness-test.cc
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you 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.
#include <glog/logging.h>
#include <gtest/gtest.h>