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: f0b2e32 7761233)

author	Greg Farnum <greg@inktank.com>
	Tue, 12 Feb 2013 06:02:33 +0000 (22:02 -0800)
committer	Greg Farnum <greg@inktank.com>
	Tue, 12 Feb 2013 06:02:40 +0000 (22:02 -0800)
commit	8864c7302769ecb7cd72c28fd7e58ccd76c290f9
tree	487b562b8ee09409a9e78f12c1b43c342c45d744	tree \| snapshot
parent	f0b2e32af69d7d009837832066a1445c45bbc362	commit \| diff
parent	77612336a0df1910ec07af7a39a6d1825c3dce17	commit \| diff

Merge branch 'wip-mds-encode-rebased'

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

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history

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