From: Jiang Jiang Jian <jack@espressif.com>
Date: Fri, 10 Aug 2018 03:31:50 +0000 (+0800)
Subject: Merge branch 'mesh/bugfix_parent_switch' into 'master'
X-Git-Tag: v3.2-beta1~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3486ce6898ee73c7576a2eda361adca1cb6418fd;p=esp-idf

Merge branch 'mesh/bugfix_parent_switch' into 'master'

mesh: modify parent switch mechanism

See merge request idf/esp-idf!2803
---

3486ce6898ee73c7576a2eda361adca1cb6418fd