From 8539e71bd035261861471d0051b87f20b7441c4a Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Fri, 20 Jan 2012 21:07:21 +0000
Subject: [PATCH] Merge -r 1234134:1234135 from trunk to branch. FIXES:
 HDFS-2816

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234138 13f79535-47bb-0310-9956-ffa450edef68
---
 .../dev-support/findbugsExcludeFile.xml          | 16 ++++++++++++++++
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt      |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml
index 1f5a4f5bc4f..94c1d76bf3e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml
@@ -1,3 +1,19 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <FindBugsFilter>
   <Match>
     <Class name="org.apache.hadoop.lib.service.instrumentation.InstrumentationService" />
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 300526af629..e32cb00ddb5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -164,6 +164,9 @@ Release 0.23.1 - UNRELEASED
     HDFS-2751. Datanode may incorrectly drop OS cache behind reads
     even for short reads. (todd)
 
+    HDFS-2816. Fix missing license header in httpfs findbugsExcludeFile.xml.
+    (hitesh via tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES