You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/10/30 18:38:45 UTC
git commit: HADOOP-11250. fix endmacro of
set_find_shared_library_without_version in CMakeLists (Yi Liu via Colin P.
McCabe) (cherry picked from commit e488f0d93bf22d25aaaac7a6a88fc300f9aa6d5a)
(cherry picked from commit e107ea5177776bbe14178859a53740f72
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 773ba8b60 -> a4b54dfc8
HADOOP-11250. fix endmacro of set_find_shared_library_without_version in CMakeLists (Yi Liu via Colin P. McCabe)
(cherry picked from commit e488f0d93bf22d25aaaac7a6a88fc300f9aa6d5a)
(cherry picked from commit e107ea5177776bbe14178859a53740f72a46b64b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4b54dfc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4b54dfc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4b54dfc
Branch: refs/heads/branch-2.6
Commit: a4b54dfc84617ee013fcb7a44c59127e9f066b4b
Parents: 773ba8b
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Thu Oct 30 10:37:24 2014 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Thu Oct 30 10:38:39 2014 -0700
----------------------------------------------------------------------
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/a4b54dfc/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 2549497..36d208f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -655,6 +655,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-9740. Fix FsShell '-text' command to be able to read Avro
files stored in HDFS and other filesystems. (Allan Yan via jlowe)
+ HADOOP-11250. fix endmacro of set_find_shared_library_without_version in
+ CMakeLists (Yi Liu via Colin P. McCabe)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4b54dfc/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 af375f6..b8ac460 100644
--- a/hadoop-common-project/hadoop-common/src/CMakeLists.txt
+++ b/hadoop-common-project/hadoop-common/src/CMakeLists.txt
@@ -94,7 +94,7 @@ macro(set_find_shared_library_without_version)
# Most UNIX variants use .so
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
ENDIF()
-endmacro(set_find_shared_library_version LVERS)
+endmacro(set_find_shared_library_without_version)
if (NOT GENERATED_JAVAH)
# Must identify where the generated headers have been placed