]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-rpm-epoch-firefly' into firefly
authorSage Weil <sage@redhat.com>
Mon, 6 Oct 2014 14:01:50 +0000 (07:01 -0700)
committerSage Weil <sage@redhat.com>
Mon, 6 Oct 2014 14:01:50 +0000 (07:01 -0700)
Reviewed-by: Boris Ranto <branto@redhat.com>

Trivial merge