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 vi...@apache.org on 2015/03/19 07:30:23 UTC
hadoop git commit: HDFS-7869. Update action param from 'start' to
'prepare' in rolling upgrade ( Contributed by J.Andreina)
Repository: hadoop
Updated Branches:
refs/heads/trunk 19b298f61 -> 338b477ff
HDFS-7869. Update action param from 'start' to 'prepare' in rolling upgrade ( Contributed by J.Andreina)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/338b477f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/338b477f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/338b477f
Branch: refs/heads/trunk
Commit: 338b477ff736cb6c8fb8204ab83fb038594dadf0
Parents: 19b298f
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Mar 19 11:59:31 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Mar 19 11:59:31 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java | 2 +-
.../main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/338b477f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ad34527..f78c9a3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -330,6 +330,9 @@ Release 2.8.0 - UNRELEASED
HDFS-5356. MiniDFSCluster should close all open FileSystems when shutdown()
(Rakesh R via vinayakumarb)
+ HDFS-7869. Update action param from "start" to "prepare" in rolling upgrade
+ javadoc (J.Andreina via vinayakumarb)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/338b477f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index e6bbd92..c750e79 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -1226,7 +1226,7 @@ public class DistributedFileSystem extends FileSystem {
}
/**
- * Rolling upgrade: start/finalize/query.
+ * Rolling upgrade: prepare/finalize/query.
*/
public RollingUpgradeInfo rollingUpgrade(RollingUpgradeAction action)
throws IOException {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/338b477f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
index d4fe903..2b07789 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
@@ -847,7 +847,7 @@ public interface ClientProtocol {
/**
* Rolling upgrade operations.
- * @param action either query, start or finailze.
+ * @param action either query, prepare or finalize.
* @return rolling upgrade information.
*/
@Idempotent