Skip to content

Conversation

@ChenSammi
Copy link
Contributor

@ChenSammi ChenSammi commented Apr 1, 2021

https://issues.apache.org/jira/browse/HDDS-4936

(this pr continues the work / discussion started in #2018)

@ChenSammi
Copy link
Contributor Author

ChenSammi commented Apr 1, 2021

@adoroszlai , Could you check if your patches are all included in this new MR.

Copy link
Member

@elek elek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, thanks the update @ChenSammi

I tried to merge the same master to the last commit from #2018 (which includes the commits from @adoroszlai) and the difference were very small:

diff --git hadoop-hdds/common/pom.xml hadoop-hdds/common/pom.xml
index 6da1ff570..bc6dde7ca 100644
--- hadoop-hdds/common/pom.xml
+++ hadoop-hdds/common/pom.xml
@@ -193,8 +193,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>hdds-interface-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-admin</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-admin</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
diff --git pom.xml pom.xml
index 40bdaaf82..664172922 100644
--- pom.xml
+++ pom.xml
@@ -2002,7 +2002,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           </dependencies>
           <configuration>
             <configLocation>hadoop-hdds/dev-support/checkstyle/checkstyle.xml</configLocation>
-            <suppressionsLocation>hdds/dev-support/checkstyle/suppressions.xml</suppressionsLocation>
+            <suppressionsLocation>hadoop-hdds/dev-support/checkstyle/suppressions.xml</suppressionsLocation>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
             <failOnViolation>false</failOnViolation>
             <format>xml</format>

In Both cases this PR is the good one.

It also confirms that all the commits from @adoroszlai are included here.

@ChenSammi
Copy link
Contributor Author

ChenSammi commented Apr 2, 2021

Thanks @elek . I will hold on the commit until @mukul1987 finishes Cloudera internal release.

@adoroszlai
Copy link
Contributor

@ChenSammi Since now we have conflicts on both PRs, I have merged master into your original branch and resolved conflicts. Closing this duplicate in favor of the original PR.

@adoroszlai adoroszlai closed this Apr 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants