]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge commit '4ada7cc8e908a26b4640497b64b2ed9986889a92' into next
authorSage Weil <sage@redhat.com>
Tue, 3 Feb 2015 14:50:22 +0000 (06:50 -0800)
committerSage Weil <sage@redhat.com>
Tue, 3 Feb 2015 14:50:22 +0000 (06:50 -0800)

Trivial merge