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: 518b95d c2c09be)

author	Sage Weil <sage@newdream.net>
	Tue, 7 Sep 2010 19:13:39 +0000 (12:13 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 7 Sep 2010 19:13:39 +0000 (12:13 -0700)
commit	90dd3c3e8946d33d96341ab06050f7488fd94d74
tree	21009a036ae16c1b624b44687ab41938aa97f8dc	tree \| snapshot
parent	518b95df865911d30be39e5ed2ebb22be81b26d9	commit \| diff
parent	c2c09be383a60ad62c2a080e7e88d904737b7a9e	commit \| diff

Merge branch 'testing' into unstable

Conflicts:
configure.ac
src/mds/MDCache.cc

src/mds/CInode.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.h	diff1 \|	diff2 \|	blob \| history
src/mds/SimpleLock.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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