]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-firefly-rgw-backports' into firefly
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 16 Jan 2015 00:40:48 +0000 (16:40 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 16 Jan 2015 00:40:48 +0000 (16:40 -0800)

Trivial merge