git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c02e293 3c7500b)

author	Samuel Just <sjust@redhat.com>
	Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
committer	Samuel Just <sjust@redhat.com>
	Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)
commit	0f9f4e536e1c937700287a5b311567b62a087207
tree	649104cdf28f0a085e8cbb0faac9e7780362d4f8	tree \| snapshot
parent	c02e293911dfe43c4ecc7aee0f2ca72e1b0578f1	commit \| diff
parent	3c7500b60c54863eac77fdfe6ab5e4df5c16a258	commit \| diff

Merge remote-tracking branch 'upstream/next'

src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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