From a8d8b80a205c78bf0aa65d32a6a83c16d3ea3f0b Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Fri, 1 Apr 2016 13:59:14 +0900
Subject: [PATCH] HADOOP-11661. Deprecate FileUtil#copyMerge. Contributed by
 Brahma Reddy Battula.

---
 .../src/main/java/org/apache/hadoop/fs/FileUtil.java             | 1 +
 .../src/test/java/org/apache/hadoop/fs/TestFileUtil.java         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
index e74c41c8290..b855c4851a5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
@@ -381,6 +381,7 @@ public static boolean copy(FileSystem srcFS, FileStatus srcStatus,
 
   }
 
+  @Deprecated
   /** Copy all files in a directory to one output file (merge). */
   public static boolean copyMerge(FileSystem srcFS, Path srcDir,
                                   FileSystem dstFS, Path dstFile,
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
index 5fc0b2dc2aa..f7464b7fce7 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
@@ -559,6 +559,7 @@ public void testCopyMergeSingleDirectory() throws IOException {
    * @return boolean true if the call to FileUtil.copyMerge was successful.
    * @throws IOException if an I/O error occurs.
    */
+  @SuppressWarnings("deprecation")
   private boolean copyMerge(String src, String dst)
       throws IOException {
     Configuration conf = new Configuration();