Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f3ed5b68c -> 05d831c4b


YARN-3113. Release audit warning for Sorting icons.psd. Contributed by Steve 
Loughran.
(cherry picked from commit f33c99ba3900f21901b479ad6e85f5cd95a9c657)


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

Branch: refs/heads/branch-2
Commit: 05d831c4b7d075bd330af57c140229a37105f872
Parents: f3ed5b6
Author: Kihwal Lee <[email protected]>
Authored: Mon Feb 2 12:58:35 2015 -0600
Committer: Kihwal Lee <[email protected]>
Committed: Mon Feb 2 12:59:45 2015 -0600

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                            | 2 ++
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05d831c4/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3fff994..8f55173 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -414,6 +414,8 @@ Release 2.7.0 - UNRELEASED
 
     YARN-3077. Fixed RM to create zk root path recursively. (Chun Chen via 
jianhe)
 
+    YARN-3113. Release audit warning for Sorting icons.psd. (stevel via kihwal)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05d831c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
index c33ef79..31c6e0a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -213,6 +213,7 @@
             <exclude>src/main/resources/webapps/node/.keep</exclude>
             
<exclude>src/main/resources/webapps/static/dt-1.9.4/css/jui-dt.css</exclude>
             
<exclude>src/main/resources/webapps/static/dt-1.9.4/css/demo_table.css</exclude>
+            <exclude>src/main/resources/webapps/static/dt-1.9.4/images/Sorting 
icons.psd</exclude>
             
<exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
           </excludes>
         </configuration>

Reply via email to