]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #25316 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 12 Dec 2018 20:41:46 +0000 (12:41 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 12 Dec 2018 20:41:46 +0000 (12:41 -0800)
commit3b21c536d80cee4ce62d260cfea680b4963db305
treedbb5a65c37e0163d7f8d89b9ca73398c1234af83
parent01cdaf9dad102ad29165766996dde2eed89bdceb
parentd308b54db57591eff6a5e17dfc6c385156a79f53
Merge PR #25316 into master

* refs/pull/25316/head:
client: don't update importing caps' mseq when handing cap export
mds: don't exclude disallowed caps when recording wanted caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/client/Client.cc