diff --git a/BUILDING.txt b/BUILDING.txt index bbad5efb22..621a221edc 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -8,7 +8,7 @@ Requirements: * Maven 3.0 or later * Findbugs 1.3.9 (if running findbugs) * ProtocolBuffer 2.5.0 -* CMake 2.6 or newer (if compiling native code) +* CMake 2.6 or newer (if compiling native code), must be 3.0 or newer on Mac * Zlib devel (if compiling native code) * openssl devel ( if compiling native hadoop-pipes ) * Internet connection for first build (to fetch all Maven and Hadoop dependencies) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9d0816f041..f90a988427 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -895,6 +895,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11049. javax package system class default is too broad (Sangjin Lee via jlowe) + HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is + required on Mac. (cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES