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: c044829 9f4fd4a)

author	Sage Weil <sage@newdream.net>
	Sat, 30 Oct 2010 22:04:13 +0000 (15:04 -0700)
committer	Sage Weil <sage@newdream.net>
	Sat, 30 Oct 2010 22:04:13 +0000 (15:04 -0700)
commit	6c69c25923d63ea8680c4429583130e9b5faee1b
tree	b8e4986b30be5a9949b65228af2f384d35e83670	tree \| snapshot
parent	c044829c47ede56843a2857b046b41dddd500cbc	commit \| diff
parent	9f4fd4a6d9af4a2cc2c365117e6dd4564f81f40a	commit \| diff

Merge remote branch 'origin/testing' into unstable

Conflicts:
configure.ac

src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history

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