]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable
authorYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 27 Feb 2009 23:49:01 +0000 (15:49 -0800)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 27 Feb 2009 23:49:01 +0000 (15:49 -0800)
commit1295321763ea4bfba3889f03aec0a422dbc2e9dd
treee75982301283e721f23d14fb3824f2baa48be852
parentc2e1fa50bf960bc4855d9eef9de1e5f6e2543dbb
parent2b9781080d3e6456ac218f5b017b9984069a5a64
Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable

Conflicts:

src/ceph-daemons
src/ceph-daemons