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: 4c1cb28 f94e2ab)

author	Sage Weil <sage@newdream.net>
	Tue, 21 Jun 2011 22:54:54 +0000 (15:54 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 21 Jun 2011 22:54:54 +0000 (15:54 -0700)
commit	bdb7991c29b82ba5a85d8c79059a5551d78c0f14
tree	af5da11603ceb929ca75153e947134b462f67b58	tree \| snapshot
parent	4c1cb28cb6cbb3d23a1736d02f6af524481c886a	commit \| diff
parent	f94e2ab61a30adec03ea4a2c85553fbbe2a2e5c3	commit \| diff

Merge branch 'stable' into next

Conflicts:
src/osd/OSD.cc

src/librbd.cc	diff1 \|	diff2 \|	blob \| history
src/mds/events/EMetaBlob.h	diff1 \|	diff2 \|	blob \| history
src/mds/journal.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history

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