 Pedro Algarvio
|
f92b4d0bf9
Syntax/Lint fixes missed from merge forward
|
vor 5 Jahren |
|
Pedro Algarvio
|
aaa399c7a7
Merge branch 'merge-forward/2018.3-to-2019.2' into merge-forward/2019.2-develop
|
vor 5 Jahren |
|
Ch3LL
|
fc70884ca1
Reload matcher loader when ext_pillar_first set
|
vor 5 Jahren |
|
Dmitry Kuzmenko
|
8034033191
Merge branch '2019.2' into develop
|
vor 5 Jahren |
|
Wayne Werner
|
ee3115fa94
Allow leading dots and / as pillar separators
|
vor 5 Jahren |
|
Wayne Werner
|
8342898763
Allow pillar relative includes
|
vor 5 Jahren |
|
Pedro Algarvio
|
0ac7520c67
Merge remote-tracking branch 'upstream/fluorine' into merge-forward/fluorine-develop
|
vor 6 Jahren |
|
Pedro Algarvio
|
0f5525dcc2
Fix mocking
|
vor 6 Jahren |
|
Pedro Algarvio
|
0545cb5c7a
Point paths to RUNTIME_VARS
|
vor 6 Jahren |
|
rallytime
|
82e73fe49d
Merge branch '2018.3' into 'fluorine'
|
vor 6 Jahren |
|
Erik Johnson
|
f59506d4cc
Update tests to reflect behavior changes
|
vor 6 Jahren |
|
Erik Johnson
|
0125185fdb
lint
|
vor 6 Jahren |
|
Erik Johnson
|
b829729fec
Fix pillar unit tests to work properly with loader-based matchers
|
vor 6 Jahren |
|
C. R. Oldham
|
34d3ef0900
Remove Matcher class and use the bare loader.
|
vor 6 Jahren |
|
rallytime
|
18936bc5c1
Add optimization_order to unit test mocks
|
vor 6 Jahren |
|
rallytime
|
6e6091c3ba
Merge branch '2018.3' into 'fluorine'
|
vor 6 Jahren |
|
rallytime
|
83a15cb623
Add optimization_order config to mocked opts
|
vor 6 Jahren |
|
rallytime
|
201031fa8a
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
0441cd56ef
Add optimization_order to mocking
|
vor 6 Jahren |
|
rallytime
|
7dc1e770c4
Merge branch '2018.3' into 'develop'
|
vor 6 Jahren |
|
rallytime
|
3273bbdab7
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
93ee5ee2b0
Fix all Sphinx warnings
|
vor 6 Jahren |
|
Erik Johnson
|
d185f97a47
mocked file_roots and pillar_roots should be dicts
|
vor 6 Jahren |
|
Erik Johnson
|
3df82869d0
Mock __gather_avail in test_includes_override_sls
|
vor 6 Jahren |
|
Erik Johnson
|
af83a5755d
mocked file_roots and pillar_roots should be dicts
|
vor 6 Jahren |
|
Erik Johnson
|
ba4ac60787
Remove trailing whitespace
|
vor 6 Jahren |
|
rallytime
|
5b50eaf6b0
Merge branch '2018.3' into 'develop'
|
vor 6 Jahren |
|
rallytime
|
e312efb5e7
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
rallytime
|
2c4668a5cb
Merge branch '2018.3' into 'develop'
|
vor 6 Jahren |
|
Nicole Thomas
|
fadc5e4ba4
Merge pull request #46669 from terminalmage/pillar-merge-order
|
vor 6 Jahren |
