]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcb42ca a120d81)
Merge branch 'wip-5492-gl' into next
authorGary Lowell <gary.lowell@inktank.com>
Wed, 10 Jul 2013 21:28:35 +0000 (14:28 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Wed, 10 Jul 2013 21:28:35 +0000 (14:28 -0700)
Re-instate fix for #5492 with corrections.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.