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: 0e8ade1 16ead95)

author	Kefu Chai <tchaikov@gmail.com>
	Mon, 31 Aug 2015 04:11:09 +0000 (12:11 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Mon, 31 Aug 2015 04:11:09 +0000 (12:11 +0800)
commit	f8f33bcaa6111aa1bab1f8246b7d516a60ab23a8
tree	11d951ed360d273bd8513b7d02da4fa81040a2cb	tree \| snapshot
parent	0e8ade1b6473c1fa322469fb1aae5561891a3b99	commit \| diff
parent	16ead95daa3d1309e8e76e57416b4201e71d0449	commit \| diff

Merge pull request #5024 from xinxinsh/wip-12018

make rbd and pool quota work

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	diff1 \|	diff2 \|	blob \| history

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