]> 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: 1cf30e6 8571739)
Merge pull request #3537 from ceph/wip-10688-boost-157
authorLoic Dachary <ldachary@redhat.com>
Sun, 1 Feb 2015 12:16:34 +0000 (13:16 +0100)
committerLoic Dachary <ldachary@redhat.com>
Sun, 1 Feb 2015 12:16:34 +0000 (13:16 +0100)
#10688: support Boost 1.57.0

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/osd/ReplicatedPG.h patch | diff1 | diff2 | blob | history
src/osd/osd_types.h patch | diff1 | diff2 | blob | history

diff --cc src/osd/ReplicatedPG.h
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.