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: c1cffc7 62999ea)

author	Sage Weil <sage@inktank.com>
	Tue, 26 Feb 2013 20:25:43 +0000 (12:25 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 26 Feb 2013 20:25:43 +0000 (12:25 -0800)
commit	dd123333b8e432e1b84b67b500437949d2e75dff
tree	4e8eb335a6650125dc07c0094b00356fcf395248	tree \| snapshot
parent	c1cffc714ead02dd5176e68249af49ca8349e06b	commit \| diff
parent	62999ea2d362b32dfc86a15dcb03b06fb5cb0572	commit \| diff

Merge remote-tracking branch 'gh/wip_4257'

Reviewed-by: Sage Weil <sage@inktank.com>

src/osd/ReplicatedPG.cc

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