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: 904af33 e8847b2)

author	Sage Weil <sage@newdream.net>
	Mon, 25 Apr 2011 21:34:49 +0000 (14:34 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 25 Apr 2011 21:34:49 +0000 (14:34 -0700)
commit	3f8204136a2dba3162dda047f2bdd107aa5c705c
tree	300370c38bf594b9af5f81a01aff72ad459cd2d4	tree \| snapshot
parent	904af336e56586d661ac76b8c384663fd10008ee	commit \| diff
parent	e8847b2cddbadf4f31972b490d80944dcb9f992d	commit \| diff

Merge branch 'stable'

Conflicts:
src/mds/MDLog.cc
src/osdc/Journaler.cc
src/osdc/Journaler.h

src/mds/MDLog.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDLog.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Resetter.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Journaler.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Journaler.h	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	diff1 \|	diff2 \|	blob \| history

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