]> 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: 512c7aa b89ab5f)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Wed, 16 Jul 2014 22:28:10 +0000 (15:28 -0700)
committerSage Weil <sage@redhat.com>
Wed, 16 Jul 2014 22:28:10 +0000 (15:28 -0700)
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.