From: Angus Gratton <angus@espressif.com>
Date: Tue, 22 May 2018 05:30:58 +0000 (+0800)
Subject: Merge branch 'bugfix/parallel_multi_heap_test' into 'master'
X-Git-Tag: v3.1-beta1~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46d6fd1ddf1ecdbd30c47dbef82784b7398d791a;p=esp-idf

Merge branch 'bugfix/parallel_multi_heap_test' into 'master'

CI fix: multi heap host test parallel race

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

46d6fd1ddf1ecdbd30c47dbef82784b7398d791a