svn commit: r1596873 - in /hadoop/common/branches/fs-encryption: ./ .gitignore hadoop-project/src/site/site.xml hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java

[umamahesh]

Author: umamahesh
Date: Thu May 22 13:54:53 2014
New Revision: 1596873

URL: http://svn.apache.org/r1596873
Log:
Merge from trunk to fs-encryption branch

Modified:
    hadoop/common/branches/fs-encryption/   (props changed)
    hadoop/common/branches/fs-encryption/.gitignore
    hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
    
hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java

Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1595302-1596815

Modified: hadoop/common/branches/fs-encryption/.gitignore
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/.gitignore?rev=1596873&r1=1596872&r2=1596873&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/.gitignore (original)
+++ hadoop/common/branches/fs-encryption/.gitignore Thu May 22 13:54:53 2014
@@ -1,6 +1,8 @@
 *.iml
 *.ipr
 *.iws
+*.orig
+*.rej
 .idea
 .svn
 .classpath

Modified: hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml?rev=1596873&r1=1596872&r2=1596873&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml 
(original)
+++ hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml Thu 
May 22 13:54:53 2014
@@ -86,6 +86,7 @@
       <item name="Centralized Cache Management" 
href="hadoop-project-dist/hadoop-hdfs/CentralizedCacheManagement.html"/>
       <item name="HDFS NFS Gateway" 
href="hadoop-project-dist/hadoop-hdfs/HdfsNfsGateway.html"/>
       <item name="HDFS Rolling Upgrade" 
href="hadoop-project-dist/hadoop-hdfs/HdfsRollingUpgrade.html"/>
+      <item name="Extended Attributes" 
href="hadoop-project-dist/hadoop-hdfs/ExtendedAttributes.html"/>
     </menu>
 
     <menu name="MapReduce" inherit="top">

Modified: 
hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java?rev=1596873&r1=1596872&r2=1596873&view=diff
==============================================================================
--- 
hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
 (original)
+++ 
hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
 Thu May 22 13:54:53 2014
@@ -36,6 +36,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -872,4 +874,11 @@ public class ResourceSchedulerWrapper im
       throws YarnException {
     return scheduler.moveApplication(appId, newQueue);
   }
+
+  @Override
+  @LimitedPrivate("yarn")
+  @Unstable
+  public Resource getClusterResource() {
+    return null;
+  }
 }