]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29eac1d 560f5f1)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Sun, 2 Feb 2014 17:40:11 +0000 (09:40 -0800)
committerSage Weil <sage@inktank.com>
Sun, 2 Feb 2014 17:40:11 +0000 (09:40 -0800)
Conflicts:
src/mon/OSDMonitor.cc
src/osd/OSDMap.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.