]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-7588-firefly' into firefly
authorSamuel Just <sam.just@inktank.com>
Mon, 13 Oct 2014 17:34:47 +0000 (10:34 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 13 Oct 2014 17:34:47 +0000 (10:34 -0700)

Trivial merge