You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2016/09/09 05:28:48 UTC
hadoop git commit: HADOOP-13579. Fix source-level compatibility after
HADOOP-11252. Contributed by Tsuyoshi Ozawa.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 607801b2f -> e807fde44
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/e807fde4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e807fde4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e807fde4
Branch: refs/heads/branch-2.7
Commit: e807fde4484626521446c87c8d23866bf5540723
Parents: 607801b
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Sep 9 14:27:57 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Sep 9 14:27:57 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/e807fde4/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 1269267..8260ea8 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e807fde4/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 42b9934..5612f8d 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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org