diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1269267c627..8260ea857c6 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -34,6 +34,9 @@ Release 2.7.4 - UNRELEASED HADOOP-12418. TestRPC.testRPCInterruptedSimple fails intermittently. (kihwal) + HADOOP-13579. Fix source-level compatibility after HADOOP-11252. + (Tsuyoshi Ozawa via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java index 42b99345bd6..5612f8d23f3 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java @@ -212,7 +212,8 @@ public class Client { * @param conf Configuration * @param pingInterval the ping interval */ - static final void setPingInterval(Configuration conf, int pingInterval) { + public static final void setPingInterval(Configuration conf, + int pingInterval) { conf.setInt(CommonConfigurationKeys.IPC_PING_INTERVAL_KEY, pingInterval); } @@ -223,7 +224,7 @@ public class Client { * @param conf Configuration * @return the ping interval */ - static final int getPingInterval(Configuration conf) { + public static final int getPingInterval(Configuration conf) { return conf.getInt(CommonConfigurationKeys.IPC_PING_INTERVAL_KEY, CommonConfigurationKeys.IPC_PING_INTERVAL_DEFAULT); }