]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/giant'
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 17 Sep 2014 19:23:17 +0000 (12:23 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 17 Sep 2014 19:23:17 +0000 (12:23 -0700)

Trivial merge