]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-6179'
authorSage Weil <sage@inktank.com>
Tue, 3 Sep 2013 17:07:26 +0000 (10:07 -0700)
committerSage Weil <sage@inktank.com>
Tue, 3 Sep 2013 17:07:26 +0000 (10:07 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge