]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/stable'
authorSage Weil <sage@newdream.net>
Tue, 3 May 2011 19:36:16 +0000 (12:36 -0700)
committerSage Weil <sage@newdream.net>
Tue, 3 May 2011 19:36:16 +0000 (12:36 -0700)
commitc0c2029922e3b3e1279738e509dd742818fd7484
tree151f7e21dd4bbf7e82af1f2c7b63247406e50861
parentf680eca79095a093c291046d95ef3f284c443070
parent5ac87ffd36c7a3561266d198726eefc9f6a11036
Merge remote branch 'origin/stable'

Conflicts:
src/mon/OSDMonitor.cc
src/client/fuse_ll.cc
src/common/config.cc
src/mon/OSDMonitor.cc