]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
committerSage Weil <sage@inktank.com>
Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
commitdd5b60b4f1c65702a71111e1e63346f3a056057d
treecf038288caff592906439e8dd0c9adff5e5cb0e9
parentc7937ff38c9e0b9f7d98b454f9575753cf34fb1c
parent50a21833fb7cb39de5f8e55a87f3ec7cd8820fe2
Merge remote-tracking branch 'gh/next'
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h
src/osd/OSD.cc