Repository: hadoop Updated Branches: refs/heads/branch-2 1d1e7682c -> a0976152e
HADOOP-11348. Remove unused variable from CMake error message for finding openssl (Dian Fu via Colin P. McCabe) (cherry picked from commit 565b0e60a8fc4ae5bc0083cc6a6ddb2d01952f32) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a0976152 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a0976152 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a0976152 Branch: refs/heads/branch-2 Commit: a0976152e66dd2cdfbc06f5c3e771966cb2d08ec Parents: 1d1e768 Author: Colin Patrick Mccabe <[email protected]> Authored: Thu Dec 4 12:51:42 2014 -0800 Committer: Colin Patrick Mccabe <[email protected]> Committed: Thu Dec 4 12:54:59 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/src/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0976152/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 655216e..6394cd4 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -136,6 +136,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11332. KerberosAuthenticator#doSpnegoSequence should check if kerberos TGT is available in the subject. (Dian Fu via atm) + HADOOP-11348. Remove unused variable from CMake error message for finding + openssl (Dian Fu via Colin P. McCabe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0976152/hadoop-common-project/hadoop-common/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/CMakeLists.txt b/hadoop-common-project/hadoop-common/src/CMakeLists.txt index b8ac460..29fa2b8 100644 --- a/hadoop-common-project/hadoop-common/src/CMakeLists.txt +++ b/hadoop-common-project/hadoop-common/src/CMakeLists.txt @@ -202,7 +202,7 @@ if (USABLE_OPENSSL) "${D}/crypto/OpensslCipher.c" "${D}/crypto/random/OpensslSecureRandom.c") else (USABLE_OPENSSL) - MESSAGE("Cannot find a usable OpenSSL library. OPENSSL_LIBRARY=${OPENSSL_LIBRARY}, OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}, CUSTOM_OPENSSL_INCLUDE_DIR=${CUSTOM_OPENSSL_INCLUDE_DIR}, CUSTOM_OPENSSL_PREFIX=${CUSTOM_OPENSSL_PREFIX}, CUSTOM_OPENSSL_INCLUDE=${CUSTOM_OPENSSL_INCLUDE}") + MESSAGE("Cannot find a usable OpenSSL library. OPENSSL_LIBRARY=${OPENSSL_LIBRARY}, OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}, CUSTOM_OPENSSL_LIB=${CUSTOM_OPENSSL_LIB}, CUSTOM_OPENSSL_PREFIX=${CUSTOM_OPENSSL_PREFIX}, CUSTOM_OPENSSL_INCLUDE=${CUSTOM_OPENSSL_INCLUDE}") IF(REQUIRE_OPENSSL) MESSAGE(FATAL_ERROR "Terminating build because require.openssl was specified.") ENDIF(REQUIRE_OPENSSL)
