ArafatKhan2198 commented on code in PR #8788:
URL: https://github.com/apache/ozone/pull/8788#discussion_r2204045355
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerStateMap.java:
##########
@@ -17,11 +17,19 @@
package org.apache.hadoop.hdds.scm.container.states;
+<<<<<<< Updated upstream
+=======
+import com.google.common.annotations.VisibleForTesting;
Review Comment:
Apologies for that! they came by mistake when I tried git stash
Have removed it now!
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java:
##########
@@ -72,6 +74,42 @@ default List<ContainerInfo> getContainers() {
*/
List<ContainerInfo> getContainers(ContainerID startID, int count);
+<<<<<<< Updated upstream
Review Comment:
Apologies for that! they came by mistake when I tried git stash
Have removed it now!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
