Matt Martz 0bbb67383b Backport #38827 for 2.5 - Allow inheriting attrs from static parents (#38847) ... * Skip self._parent on dynamic, defer to grandparent for attr lookup (#38827) * Skip self._parent on dynamic, defer to grandparent for attr lookup * Revert _inheritable * Add tests for include inheritance from static blocks Fixes #38037 #36194 (cherry picked from commit 354aa8d602) * Add changelog for #38827		2018-04-20 11:45:28 -05:00
..
fragments	Backport #38827 for 2.5 - Allow inheriting attrs from static parents (#38847)	2018-04-20 11:45:28 -05:00
CHANGELOG-legacy.rst	rename versioned CHANGELOGs with dash	2018-02-22 17:32:58 -08:00
CHANGELOG-v2.0.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.1.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.2.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.3.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.4.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.5.rst	New release v2.5.1	2018-04-18 16:48:39 -07:00
config.yaml	reformat multiline bugfix entries	2018-02-21 13:51:40 -08:00