hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [hadoop] branch ozone-0.4 updated: HDDS-1236. Fix incorrect Ozone ClientProtocol KerberosInfo annotation. Contributed by Xiaoyu Yao. (#573)
Date Mon, 11 Mar 2019 16:23:13 GMT
This is an automated email from the ASF dual-hosted git repository.

ajay pushed a commit to branch ozone-0.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/ozone-0.4 by this push:
     new 89fb60f  HDDS-1236. Fix incorrect Ozone ClientProtocol KerberosInfo annotation. Contributed
by Xiaoyu Yao. (#573)
89fb60f is described below

commit 89fb60ffd07e0ea21c6fb431eacc9a575360fb93
Author: Xiaoyu Yao <xyao@apache.org>
AuthorDate: Mon Mar 11 09:19:19 2019 -0700

    HDDS-1236. Fix incorrect Ozone ClientProtocol KerberosInfo annotation. Contributed by
Xiaoyu Yao. (#573)
    
    (cherry picked from commit 4fc493e511dacc41628925bdcb3506cd944346e6)
---
 .../org/apache/hadoop/ozone/client/protocol/ClientProtocol.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 494afae..5795bb5 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
@@ -29,7 +29,12 @@ import org.apache.hadoop.hdds.client.ReplicationFactor;
 import org.apache.hadoop.hdds.client.ReplicationType;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
+<<<<<<< HEAD
 import org.apache.hadoop.ozone.client.rpc.ha.OMProxyProvider;
+=======
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
+import org.apache.hadoop.ozone.om.OMConfigKeys;
+>>>>>>> 4fc493e511d... HDDS-1236. Fix incorrect Ozone ClientProtocol
KerberosInfo annotation. Contributed by Xiaoyu Yao. (#573)
 import org.apache.hadoop.ozone.om.helpers.OmMultipartInfo;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartUploadCompleteInfo;
 
@@ -50,7 +55,7 @@ import org.apache.hadoop.security.token.Token;
  * includes: {@link org.apache.hadoop.ozone.client.rpc.RpcClient} for RPC and
  * {@link  org.apache.hadoop.ozone.client.rest.RestClient} for REST.
  */
-@KerberosInfo(serverPrincipal = ScmConfigKeys.HDDS_SCM_KERBEROS_PRINCIPAL_KEY)
+@KerberosInfo(serverPrincipal = OMConfigKeys.OZONE_OM_KERBEROS_PRINCIPAL_KEY)
 public interface ClientProtocol {
 
   /**


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message