From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 2 Mar 2015 16:53:50 +0000 (-0800)
Subject: Merge pull request #3844 from ceph/wip-10965
X-Git-Tag: v9.0.0~228
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6864dc9ae91684fd6a1bee5b1f05353dda4ae505;p=ceph.git

Merge pull request #3844 from ceph/wip-10965

Wip 10965

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

6864dc9ae91684fd6a1bee5b1f05353dda4ae505
diff --cc src/Makefile-env.am
index aca2d399d449,de9f342559ca..8716f15a7845
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@@ -152,8 -152,8 +152,9 @@@ LIBCLIENT_FUSE = libclient_fuse.l
  LIBRADOS = librados.la
  LIBRADOSSTRIPER = libradosstriper.la
  LIBRGW = librgw.la
+ LIBCIVETWEB = libcivetweb.la
  LIBRBD = librbd.la
 +LIBRBD_TYPES = librbd_types.la
  LIBKRBD = libkrbd.la
  LIBCEPHFS = libcephfs.la
  LIBERASURE_CODE = liberasure_code.la