]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge commit 'origin/unstable' into auth
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 22 Sep 2009 17:06:47 +0000 (10:06 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 22 Sep 2009 17:06:47 +0000 (10:06 -0700)
commit16ccc89ba9fc266e320d5ae6c0aecde611016ea5
treedec2a37e02dc0392949bbdd6dbdd8bcca9b14597
parent41a169d926d36d13d44037539a8e0d44faf1be5e
parent48866c2f94de196834540d1d502554ddc7182202
Merge commit 'origin/unstable' into auth

Conflicts:

src/osd/OSD.cc
src/kernel/buffer.h
src/mon/MonClient.cc
src/mon/MonClient.h
src/osd/OSD.cc