Fix some merge issues.

hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/.env~trunk

@@ -1,22 +0,0 @@
-# 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.
-
-HDDS_VERSION=@hdds.version@
-#TODO: swich to apache/hadoop. Older versions are not supported by apache/hadoop, yet.
-# See: HADOOP-16092 for more details.
-HADOOP_IMAGE=flokkr/hadoop
-HADOOP_VERSION=2.7.7
-HADOOP_RUNNER_VERSION=@docker.ozone-runner.version@

hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/.env~trunk

@@ -1,22 +0,0 @@
-# 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.
-
-HDDS_VERSION=@hdds.version@
-#TODO: swich to apache/hadoop. Older versions are not supported by apache/hadoop, yet.
-# See: HADOOP-16092 for more details.
-HADOOP_IMAGE=flokkr/hadoop
-HADOOP_VERSION=3.1.2
-HADOOP_RUNNER_VERSION=@docker.ozone-runner.version@

hadoop-ozone/fault-injection-test/network-tests/src/test/blockade/ozone/constants.py~trunk

@@ -1,23 +0,0 @@
-#!/usr/bin/python
-
-# 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.
-
-
-class Command(object):
-    docker = "docker"
-    docker_compose = "docker-compose"
-    ozone = "/opt/hadoop/bin/ozone"
-    freon = "/opt/hadoop/bin/ozone freon"

hadoop-ozone/fault-injection-test/network-tests/src/test/blockade/ozone/exceptions.py~trunk

@@ -1,22 +0,0 @@
-#!/usr/bin/python
-
-# 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.
-
-
-class ContainerNotFoundError(RuntimeError):
-    """ ContainerNotFoundError run-time error. """
-    def __init__(self, *args, **kwargs):
-        pass