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: ea1243a ef036bd)

author	Sage Weil <sage@inktank.com>
	Fri, 2 Aug 2013 18:54:53 +0000 (11:54 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 2 Aug 2013 18:54:53 +0000 (11:54 -0700)
commit	9797986697622217cb03b3420a70a49eddb6b02d
tree	b0e96a13827ff6bd825dbbc45546707cf408c28f	tree \| snapshot
parent	ea1243a1122bd48c9f514b92f6c5d83391e814e5	commit \| diff
parent	ef036bd4bc0e79bff8a5805800fbdeb0cc2db6ae	commit \| diff

Merge remote-tracking branch 'gh/next'

src/ceph.in	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history

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