]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commite4ff4720d5958c794541bb1b83217a7c636822ed
treea17b51d2191ed01c6b3231e380b0cff06e99d1d9
parent29eac1d14e2484e69888602329bdd9db060ec3c3
parent560f5f1f88fe9ecdd1839db70ff9f824475abc36
Merge remote-tracking branch 'gh/next'

Conflicts:
src/mon/OSDMonitor.cc
src/osd/OSDMap.h