[03/49] hadoop git commit: Fix a build break in HDFS-1312

2016-06-24 Thread arp
Fix a build break in HDFS-1312


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9be97037
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9be97037
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9be97037

Branch: refs/heads/trunk
Commit: 9be9703716d2787cd6ee0ebbbe44a18b1f039018
Parents: ec60167
Author: Anu Engineer 
Authored: Thu Mar 17 16:14:48 2016 -0700
Committer: Arpit Agarwal 
Committed: Thu Jun 23 18:18:48 2016 -0700

--
 .../hadoop/hdfs/server/diskbalancer/DiskBalancerException.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9be97037/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
index c3571c9..a55bcf3 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
@@ -33,7 +33,9 @@ public class DiskBalancerException extends IOException {
 PLAN_ALREADY_IN_PROGRESS,
 INVALID_VOLUME,
 INVALID_MOVE,
-INTERNAL_ERROR
+INTERNAL_ERROR,
+NO_SUCH_PLAN,
+UNKNOWN_KEY
   }
 
   private final Result result;


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



[03/49] hadoop git commit: Fix a build break in HDFS-1312

2016-06-23 Thread arp
Fix a build break in HDFS-1312


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9be97037
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9be97037
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9be97037

Branch: refs/heads/HDFS-1312
Commit: 9be9703716d2787cd6ee0ebbbe44a18b1f039018
Parents: ec60167
Author: Anu Engineer 
Authored: Thu Mar 17 16:14:48 2016 -0700
Committer: Arpit Agarwal 
Committed: Thu Jun 23 18:18:48 2016 -0700

--
 .../hadoop/hdfs/server/diskbalancer/DiskBalancerException.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9be97037/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
index c3571c9..a55bcf3 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/DiskBalancerException.java
@@ -33,7 +33,9 @@ public class DiskBalancerException extends IOException {
 PLAN_ALREADY_IN_PROGRESS,
 INVALID_VOLUME,
 INVALID_MOVE,
-INTERNAL_ERROR
+INTERNAL_ERROR,
+NO_SUCH_PLAN,
+UNKNOWN_KEY
   }
 
   private final Result result;


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org