]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/giant'
authorSage Weil <sage@redhat.com>
Sun, 14 Sep 2014 04:20:33 +0000 (21:20 -0700)
committerSage Weil <sage@redhat.com>
Sun, 14 Sep 2014 04:20:33 +0000 (21:20 -0700)

Trivial merge