]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/giant'
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 24 Sep 2014 22:27:02 +0000 (15:27 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 24 Sep 2014 22:27:02 +0000 (15:27 -0700)

Trivial merge