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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8a2de33 fa47e77)

author	Sage Weil <sage@inktank.com>
	Fri, 8 Feb 2013 06:19:58 +0000 (22:19 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 8 Feb 2013 06:19:58 +0000 (22:19 -0800)
commit	f3ba46d31fa714250e0117451494c60221d9dc1a
tree	cc9c5ff3742f89f42ce6bba41bd6b6c9e2f85a23	tree \| snapshot
parent	8a2de334fed5c56919063bba8c60a3c73bd6534c	commit \| diff
parent	fa47e77a13156a272fece698e677dcd4f9884a5b	commit \| diff

Merge remote-tracking branch 'gh/next'

src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	diff1 \|	diff2 \|	blob \| history

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