]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/wip-8880'
authorSage Weil <sage@redhat.com>
Tue, 5 Aug 2014 16:15:12 +0000 (09:15 -0700)
committerSage Weil <sage@redhat.com>
Tue, 5 Aug 2014 16:15:12 +0000 (09:15 -0700)
commitbc1d2b8328006e6b45203f822d4b89c083c4f910
tree0a3821b3112a08b020b1703ed80f00f0b433e816
parentb8c1cabd9463e709e6ddb64e11d017e12c37ccb0
parente99acf9810976b1fc74b84ad289773af43be973f
Merge remote-tracking branch 'gh/wip-8880'

Conflicts:
src/osd/OSD.cc
src/osd/OSD.cc
src/osd/OSD.h