]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #19373 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 10 Dec 2017 00:34:24 +0000 (16:34 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 10 Dec 2017 00:34:24 +0000 (16:34 -0800)
commitd2ebe22a49885243cdaa67d0d999e7a8868435fc
tree7c6e9ebf8ec67b089827a5cc88547a5325292e7b
parent717591016d780db1c0fc5f7b0fe21af904a40294
parent1aa2e7c677ab9f66f858d29cc86cf3206d6875bf
Merge PR #19373 into master

* refs/pull/19373/head:
client: drop duplicate friend

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>