Merge remote-tracking branch 'upstream/next'
authorSamuel Just <sjust@redhat.com>
Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
committerSamuel Just <sjust@redhat.com>
Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
commit0f9f4e536e1c937700287a5b311567b62a087207
tree649104cdf28f0a085e8cbb0faac9e7780362d4f8
parentc02e293911dfe43c4ecc7aee0f2ca72e1b0578f1
parent3c7500b60c54863eac77fdfe6ab5e4df5c16a258
Merge remote-tracking branch 'upstream/next'
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc