]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable
authorSage Weil <sage@newdream.net>
Wed, 9 Apr 2008 00:35:46 +0000 (17:35 -0700)
committerSage Weil <sage@newdream.net>
Wed, 9 Apr 2008 00:35:46 +0000 (17:35 -0700)
commit963b69e1276d5eaf40014ce6ba2dcbb28db59cef
tree7088dff8dfedee1755e11f27974bbbbd6ca434ae
parent746a1d5d3fe4a1cde72ab7d4366a175f6fb1af4f
parent47f7d3ac059cd5d0adf69c5f9bf1ff0aed8b647f
Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable
src/kernel/mon_client.c
src/kernel/mon_client.h