]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8924 from xiexingguo/xxg-wip-monitor
authorYuri Weinstein <yuri.weinstein@gmail.com>
Wed, 11 May 2016 18:47:36 +0000 (11:47 -0700)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Wed, 11 May 2016 18:47:36 +0000 (11:47 -0700)
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>

Trivial merge