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: 1d306ad f65cb09)

author	Sage Weil <sage@redhat.com>
	Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
committer	Sage Weil <sage@redhat.com>
	Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)
commit	aa03d6a84c5f92a78ca1a54f2107be2027cbb2c2
tree	063dc1a7fec43035dc8939b42e52390aad104787	tree \| snapshot
parent	1d306ad015f27fc68ff2c92eab284fb2342e413e	commit \| diff
parent	f65cb09e17400bbe11f754b4072623e41bac86b4	commit \| diff

Merge remote-tracking branch 'gh/master' into hammer

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

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