]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-7676-firefly' into firefly
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 25 Mar 2014 23:40:47 +0000 (16:40 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 25 Mar 2014 23:40:47 +0000 (16:40 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge