 rallytime
|
2c4668a5cb
Merge branch '2018.3' into 'develop'
|
6 лет назад |
|
Nicole Thomas
|
fadc5e4ba4
Merge pull request #46669 from terminalmage/pillar-merge-order
|
6 лет назад |
|
Erik Johnson
|
b4a1d34b47
Add option to return to pre-2017.7.3 pillar include merge order
|
6 лет назад |
|
rallytime
|
0f728186aa
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists
|
6 лет назад |
|
rallytime
|
46ba72fb1c
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists
|
6 лет назад |
|
rallytime
|
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
|
6 лет назад |
|
Benjamin Drung
|
584b451fd1
Support dynamic pillar_root environment
|
6 лет назад |
|
Marlowe W
|
928a7a93f9
fix lint
|
6 лет назад |
|
Marlowe W
|
5875d338a7
fix test_malformed_pillar_sls
|
6 лет назад |
|
Marlowe W
|
b480d5343b
split pillar include unit test
|
6 лет назад |
|
rallytime
|
60370f5fb6
Merge branch '2017.7' into 'oxygen'
|
6 лет назад |
|
Marlowe W
|
a49eec774e
add unit test on wildcard in include
|
7 лет назад |
|
Marlowe W
|
976244b62d
fix pylint in test_pillar
|
7 лет назад |
|
Marlowe W
|
e6205b2301
fix PillarTestCase
|
7 лет назад |
|
Steve Weber
|
942c14bb29
pillar body overrides includes
|
7 лет назад |
|
Steve Weber
|
507d854b3c
pillar body overrides includes
|
7 лет назад |
|
Erik Johnson
|
683e2cc502
Rename 'environment' config option to 'saltenv'
|
7 лет назад |
|
rallytime
|
b8dc018178
Merge branch '2017.7' into 'develop'
|
7 лет назад |
|
twangboy
|
00dbba5712
Fix `unit.test_pillar` for Windows
|
7 лет назад |
|
Alexandru Bleotu
|
33feda7a5b
Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests
|
7 лет назад |
|
Alexandru Bleotu
|
dc082a2087
pylint fix and fix when calling _external_pillar_data function
|
7 лет назад |
|
Alexandru Bleotu
|
a771dd94f3
Added tests for external pillar function calls
|
7 лет назад |
|
Alexandru Bleotu
|
2090d9d32f
Added tests for AsyncRemotePillar adding extra minion data from config
|
7 лет назад |
|
Alexandru Bleotu
|
5b383f0036
Added tests for RemotePillar adding extra minion data from config
|
7 лет назад |
|
Erik Johnson
|
3184168365
Use explicit unicode strings + break up salt.utils
|
7 лет назад |
|
Andrew Pashkin
|
b0148c15c7
Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"
|
7 лет назад |
|
Andrew Pashkin
|
7d59f7a6c6
Make possible to reference pillars, that come before current pillar in the top file
|
8 лет назад |
|
Marlowe W
|
d66281bda6
pillar: fix tests
|
7 лет назад |
|
Pedro Algarvio
|
abe608d739
Drop `@patch` usage
|
7 лет назад |
|
Pedro Algarvio
|
b25b26e23d
Cleanup test attributes once finished
|
7 лет назад |
