From c8f2880f98933b12287d3ff075a8ef67498c2719 Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ozawa <ozawa@apache.org>
Date: Wed, 25 Mar 2015 18:02:32 +0900
Subject: [PATCH] HADOOP-11738. Fix a link of Protocol Buffers 2.5 for download
 in BUILDING.txt. (ozawa)

(cherry picked from commit 323945b33a5bccc42e90ed619ea155503cc124b0)
---
 BUILDING.txt                                    | 4 ++--
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index c126c5e02e4..02b86107e31 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -29,7 +29,7 @@ Installing required packages for clean install of Ubuntu 14.04 LTS Desktop:
 * Native libraries
   $ sudo apt-get -y install build-essential autoconf automake libtool cmake zlib1g-dev pkg-config libssl-dev
 * ProtocolBuffer 2.5.0
-  $ wget https://protobuf.googlecode.com/svn/rc/protobuf-2.5.0.tar.gz
+  $ wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz
   $ tar -zxvf protobuf-2.5.0.tar.gz
   $ cd protobuf-2.5.0.tar.gz
   $ ./configure
@@ -312,4 +312,4 @@ http://www.zlib.net/
 ----------------------------------------------------------------------------------
 Building distributions:
 
- * Build distribution with native code    : mvn package [-Pdist][-Pdocs][-Psrc][-Dtar]
\ No newline at end of file
+ * Build distribution with native code    : mvn package [-Pdist][-Pdocs][-Psrc][-Dtar]
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index c155aff5842..5827f2df9cc 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -692,6 +692,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11014. Potential resource leak in JavaKeyStoreProvider due to
     unclosed stream. (ozawa)
 
+    HADOOP-11738. Fix a link of Protocol Buffers 2.5 for download in BUILDING.txt.
+    (ozawa)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES