]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21554 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 29 Apr 2018 18:05:33 +0000 (11:05 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 29 Apr 2018 18:05:33 +0000 (11:05 -0700)
* refs/pull/21554/head:
client: avoid second lock on client_lock

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
1  2 
src/client/Client.cc
src/client/Client.h

Simple merge
Simple merge