You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aj...@apache.org on 2019/03/12 16:34:24 UTC
[hadoop] branch trunk updated: HDDS-1253. Fix checkstyle issue from
Nightly run. Contributed by Xiaoyu Yao. (#593)
This is an automated email from the ASF dual-hosted git repository.
ajay pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2778259 HDDS-1253. Fix checkstyle issue from Nightly run. Contributed by Xiaoyu Yao. (#593)
2778259 is described below
commit 2778259b88246359bcdb03496568e0a7f45da391
Author: Xiaoyu Yao <xy...@apache.org>
AuthorDate: Tue Mar 12 09:34:18 2019 -0700
HDDS-1253. Fix checkstyle issue from Nightly run. Contributed by Xiaoyu Yao. (#593)
Closes PR #593
---
.../hdds/security/x509/certificate/authority/DefaultCAServer.java | 4 ++--
.../java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
index 54fb390..a5147b3 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
@@ -246,8 +246,8 @@ public class DefaultCAServer implements CertificateServer {
return xcertHolder;
}
- private X509CertificateHolder signAndStoreCertificate(LocalDate beginDate, LocalDate endDate,
- PKCS10CertificationRequest csr) throws IOException,
+ private X509CertificateHolder signAndStoreCertificate(LocalDate beginDate,
+ LocalDate endDate, PKCS10CertificationRequest csr) throws IOException,
OperatorCreationException, CertificateException {
X509CertificateHolder xcert = approver.sign(config,
getCAKeys().getPrivate(),
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java
index 30958d1..e3a1acc 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.client.protocol;
import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdds.protocol.StorageType;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.client.*;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org