Repository: hadoop Updated Branches: refs/heads/branch-2.6 3f87efc0c -> 4ed74a917
HADOOP-13579. Fix source-level compatibility after HADOOP-11252. Contributed by Tsuyoshi Ozawa. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ed74a91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ed74a91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ed74a91 Branch: refs/heads/branch-2.6 Commit: 4ed74a917ce8da0a5ed0a72eb14de50155ecfd11 Parents: 3f87efc Author: Akira Ajisaka <[email protected]> Authored: Fri Sep 9 14:30:01 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri Sep 9 14:30:01 2016 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/ipc/Client.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ed74a91/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3c35e44..e85f27e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -42,6 +42,9 @@ Release 2.6.5 - UNRELEASED HADOOP-13297. Add missing dependency in setting maven-remote-resource-plugin to fix builds. (Sean Busbey via aajisaka) + HADOOP-13579. Fix source-level compatibility after HADOOP-11252. + (Tsuyoshi Ozawa via aajisaka) + Release 2.6.4 - 2016-02-11 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ed74a91/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java ---------------------------------------------------------------------- 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 dadfd79..478cafd 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 @@ -211,7 +211,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); } @@ -222,7 +223,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); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
