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: 32cf5ac 141509c)

author	Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
	Mon, 28 Feb 2011 09:57:58 +0000 (01:57 -0800)
committer	Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
	Mon, 28 Feb 2011 09:57:58 +0000 (01:57 -0800)
commit	f7e5e868b37df78a4131d3ef44b35cd24d458cba
tree	2f104cbf859b288e6113e68c7e6d78eb11f8a2bf	tree \| snapshot
parent	32cf5ac4c0d910b81e237879c46e6a63f3cb7a6b	commit \| diff
parent	141509c059acfb6a07faeb9192c72ff6ddf80213	commit \| diff

Merge branch 'librados_api' into next

18 files changed:

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/cmds.cc	diff1 \|	diff2 \|	blob \| history
src/common/common_init.cc	diff1 \|	diff2 \|	blob \| history
src/cosd.cc	diff1 \|	diff2 \|	blob \| history
src/mds/CDir.cc	diff1 \|	diff2 \|	blob \| history
src/mds/CInode.cc	diff1 \|	diff2 \|	blob \| history
src/mds/CInode.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Migrator.cc	diff1 \|	diff2 \|	blob \| history
src/mds/journal.cc	diff1 \|	diff2 \|	blob \| history
src/mds/mdstypes.h	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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