]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-8701-firefly' into firefly-next
authorSamuel Just <sam.just@inktank.com>
Sun, 3 Aug 2014 19:47:23 +0000 (12:47 -0700)
committerSamuel Just <sam.just@inktank.com>
Sun, 3 Aug 2014 19:47:23 +0000 (12:47 -0700)

Trivial merge