]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72d008f 1deb31d)
Merge pull request #6243 from free-luowei/master
authorSage Weil <sage@redhat.com>
Sat, 24 Oct 2015 12:29:48 +0000 (08:29 -0400)
committerSage Weil <sage@redhat.com>
Sat, 24 Oct 2015 12:29:48 +0000 (08:29 -0400)
Init crush_location in Objecter from config file.

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.