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: 4984473 0e08cb0)

author	Sage Weil <sage@newdream.net>
	Tue, 14 Dec 2010 17:55:21 +0000 (09:55 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 14 Dec 2010 17:55:21 +0000 (09:55 -0800)
commit	96b32382d0edbcf486386815fa3339ce5223bb17
tree	8e583dcd5f54eaadae3310b76adbbb05c07a8fd1	tree \| snapshot
parent	4984473848b2f2b0467ad4fc214e908d1deedf5f	commit \| diff
parent	0e08cb0f6c0eca6d2d7f59f56f5b95f342c84893	commit \| diff

Merge remote branch 'origin/unstable' into sync2

Conflicts:
src/auth/Crypto.cc
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.h

13 files changed:

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/include/ceph_fs.h	diff1 \|	diff2 \|	blob \| history
src/librados.cc	diff1 \|	diff2 \|	blob \| history
src/msg/Message.cc	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	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
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	diff1 \|	diff2 \|	blob \| history

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