]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-discard'
authorSage Weil <sage@newdream.net>
Mon, 23 Apr 2012 20:58:34 +0000 (13:58 -0700)
committerSage Weil <sage@newdream.net>
Mon, 23 Apr 2012 20:58:34 +0000 (13:58 -0700)

Trivial merge