]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge remote-tracking branch 'gh/kraken'
authorSage Weil <sage@redhat.com>
Thu, 22 Dec 2016 23:16:49 +0000 (18:16 -0500)
committerSage Weil <sage@redhat.com>
Thu, 22 Dec 2016 23:16:49 +0000 (18:16 -0500)
commit926d27fc2493fd3fc879f8d45402550fea363daa
tree8e5d0b444e66b9053d16dd0ea526f06601fade1f
parent566ad2d8b57dc25c4d2bd143df9a94a22c018991
parentba5b81e4a94c4a11977100b6cdcfdea517ac95fb
Merge remote-tracking branch 'gh/kraken'

# Conflicts:
# src/os/bluestore/BlueStore.cc
src/common/config_opts.h
src/os/bluestore/BlueStore.cc