]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/giant'
authorSamuel Just <sam.just@inktank.com>
Wed, 8 Oct 2014 18:18:13 +0000 (11:18 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 8 Oct 2014 18:18:13 +0000 (11:18 -0700)
1  2 
src/common/config_opts.h
src/osd/ReplicatedPG.cc

Simple merge
Simple merge