From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Wed, 11 May 2016 18:47:36 +0000 (-0700)
Subject: Merge pull request #8924 from xiexingguo/xxg-wip-monitor
X-Git-Tag: v11.0.0~573
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62ad33e567ced05cb2270fd99930fe6d2118b520;p=ceph.git

Merge pull request #8924 from xiexingguo/xxg-wip-monitor

mon/Monitor: fix memory leak; add leaked key to tracked_conf_key

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Marcel Lauhoff <lauhoff@uni-mainz.de>
---

62ad33e567ced05cb2270fd99930fe6d2118b520