From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 3 May 2017 03:07:29 +0000 (+0800)
Subject: Merge pull request #14909 from joscollin/wip-dmclock-error
X-Git-Tag: v12.0.3~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9fdc4aad45908f45b5401db04c071e8e66571d1;p=ceph.git

Merge pull request #14909 from joscollin/wip-dmclock-error

dmclock: error: ‘function’ in namespace ‘std’ does not name a template type

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

a9fdc4aad45908f45b5401db04c071e8e66571d1