]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-obsync'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 26 May 2011 20:17:03 +0000 (13:17 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 26 May 2011 20:17:03 +0000 (13:17 -0700)

Trivial merge