From: Sage Weil <sage@redhat.com>
Date: Sun, 18 Jan 2015 18:37:19 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-xio'
X-Git-Tag: v0.93~265
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87b3e9600a54e41509ea363c723845f7538b978e;p=ceph.git

Merge remote-tracking branch 'gh/wip-xio'

Reviewed-by: Sage Weil <sage@redhat.com>
---

87b3e9600a54e41509ea363c723845f7538b978e
diff --cc src/test/Makefile.am
index db8bafed49a0,1dbf995048e2..d36cb251c828
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@@ -383,8 -379,13 +384,8 @@@ unittest_throttle_LDADD = $(UNITTEST_LD
  unittest_throttle_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2
  check_PROGRAMS += unittest_throttle
  
 -unittest_crush_wrapper_SOURCES = test/crush/TestCrushWrapper.cc
 -unittest_crush_wrapper_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBCRUSH)
 -unittest_crush_wrapper_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2
 -check_PROGRAMS += unittest_crush_wrapper
 -
  unittest_base64_SOURCES = test/base64.cc
- unittest_base64_LDADD = $(LIBCEPHFS) -lm $(UNITTEST_LDADD)
+ unittest_base64_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) -lm $(UNITTEST_LDADD)
  unittest_base64_CXXFLAGS = $(UNITTEST_CXXFLAGS)
  check_PROGRAMS += unittest_base64