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: 56861bd 9ad05cf)

author	Sage Weil <sage@newdream.net>
	Mon, 3 Jan 2011 18:24:47 +0000 (10:24 -0800)
committer	Sage Weil <sage@newdream.net>
	Mon, 3 Jan 2011 18:24:47 +0000 (10:24 -0800)
commit	7e83b570e443e3a566b125b3ea8b0f061a6ca364
tree	c1a3fef58f8c21d27201663f1207b9bdab05683c	tree \| snapshot
parent	56861bd506fcbae688b1610906f54b90058210cd	commit \| diff
parent	9ad05cf7ffe759bd0e3258b3f7c9f239f4624a7c	commit \| diff

Merge branch 'testing' into unstable

Conflicts:
configure.ac

15 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/auth/Crypto.cc	diff1 \|	diff2 \|	blob \| history
src/auth/ExportControl.cc	diff1 \|	diff2 \|	blob \| history
src/common/common_init.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Locker.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.cc	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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