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: 0086851 fe0031d)

author	Sage Weil <sage@inktank.com>
	Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
commit	ca116a3e3118e9825c139c39c9aa9d6edede8646
tree	f7e3cc19eb140744eb05f64c162e6f8ce3f165a5	tree \| snapshot
parent	00868514ec776778c4f739c042044989f1dd3c98	commit \| diff
parent	fe0031d96a9f9b3f008c2e82062a318bc3170e1f	commit \| diff

Merge pull request #1752 from ceph/wip-da-SCA-fixes-20140501

Various fixes from SCA

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

src/mon/OSDMonitor.cc	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.