]> 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: fe54bd1 3826203)
Merge pull request #5826 from ukernel/wip-osx-port
authorGregory Farnum <greg@gregs42.com>
Mon, 21 Sep 2015 22:57:13 +0000 (15:57 -0700)
committerGregory Farnum <greg@gregs42.com>
Mon, 21 Sep 2015 22:57:13 +0000 (15:57 -0700)
fix compilation on OSX/FreeBSD

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/tools/ceph_objectstore_tool.cc patch | diff1 | diff2 | blob | history

diff --cc src/client/Client.cc
Simple merge
diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.