]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-diurchenko-master' into hammer
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 10 Feb 2015 17:44:08 +0000 (09:44 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 10 Feb 2015 17:44:08 +0000 (09:44 -0800)
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Trivial merge