Hui Xiang 79b770e0de Merge from /next and fix conflicts.

2014-09-22 16:51:15 +08:00

..

ceph.conf

Merge from /next and fix conflicts.

2014-09-22 16:51:15 +08:00