]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip_dep_fix'
authorSamuel Just <sam.just@inktank.com>
Wed, 31 Oct 2012 18:37:06 +0000 (11:37 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 31 Oct 2012 18:37:21 +0000 (11:37 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge