]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b24ee49 1de9071)
Merge remote-tracking branch 'gh/wip-misc-fixes'
authorSage Weil <sage@inktank.com>
Mon, 23 Jun 2014 15:56:39 +0000 (08:56 -0700)
committerSage Weil <sage@inktank.com>
Mon, 23 Jun 2014 15:56:39 +0000 (08:56 -0700)
commitc3393434cfb90746e1d78aeaace2e67e555d966c
treedd17cdd1b6fc74b698e838d1372a93f8dc1b728atree | snapshot
parentb24ee497394b4015a304902f8148e27626c4fd70commit | diff
parent1de9071daeccc23cf8617adef285413381c0a370commit | diff
Merge remote-tracking branch 'gh/wip-misc-fixes'

Conflicts:
src/mon/Monitor.cc

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
src/mon/Monitor.cc diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/ECBackend.cc diff1 | diff2 | blob | history
src/osd/ECMsgTypes.cc diff1 | diff2 | blob | history
src/osd/osd_types.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.