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: b6be785 054e96c)

author	Sage Weil <sage@inktank.com>
	Wed, 29 May 2013 05:10:21 +0000 (22:10 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 29 May 2013 05:10:21 +0000 (22:10 -0700)
commit	6afc22a158fea9132479cf7407c13da1504eceb5
tree	0a89132a8d10c3d5d1b8ddae2ae77126534a17e1	tree \| snapshot
parent	b6be785775442af1999b2543bd07a0d28391dbc5	commit \| diff
parent	054e96cf79e960894ef7e33a4d13635d3ad2a1b9	commit \| diff

Merge remote-tracking branch 'gh/last'

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mon/PaxosService.h	diff1 \|	diff2 \|	blob \| history
src/os/HashIndex.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history

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