From: Jiang Jiang Jian <jack@espressif.com>
Date: Fri, 1 Dec 2017 11:21:26 +0000 (+0800)
Subject: Merge branch 'bugfix/tw16581_dhcps_default_behaviour_changed' into 'master'
X-Git-Tag: v3.1-dev~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aece22f763929d899f1938f94f45ac7cc49e30fa;p=esp-idf

Merge branch 'bugfix/tw16581_dhcps_default_behaviour_changed' into 'master'

fix the dhcps default behaviour chenged by dns

See merge request !1612
---

aece22f763929d899f1938f94f45ac7cc49e30fa