Commit History

Autor SHA1 Mensaxe Data
  Erik Johnson f59506d4cc Update tests to reflect behavior changes %!s(int64=6) %!d(string=hai) anos
  rallytime 83a15cb623 Add optimization_order config to mocked opts %!s(int64=6) %!d(string=hai) anos
  rallytime 201031fa8a Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 0441cd56ef Add optimization_order to mocking %!s(int64=6) %!d(string=hai) anos
  rallytime 3273bbdab7 Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 93ee5ee2b0 Fix all Sphinx warnings %!s(int64=6) %!d(string=hai) anos
  Erik Johnson d185f97a47 mocked file_roots and pillar_roots should be dicts %!s(int64=6) %!d(string=hai) anos
  rallytime e312efb5e7 Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  Nicole Thomas fadc5e4ba4 Merge pull request #46669 from terminalmage/pillar-merge-order %!s(int64=6) %!d(string=hai) anos
  Erik Johnson b4a1d34b47 Add option to return to pre-2017.7.3 pillar include merge order %!s(int64=6) %!d(string=hai) anos
  rallytime 0f728186aa Fix pillar unit test failures: file_roots and pillar_roots environments should be lists %!s(int64=6) %!d(string=hai) anos
  rallytime 46ba72fb1c Fix pillar unit test failures: file_roots and pillar_roots environments should be lists %!s(int64=6) %!d(string=hai) anos
  rallytime 8d1e1e7f94 Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  Benjamin Drung 584b451fd1 Support dynamic pillar_root environment %!s(int64=6) %!d(string=hai) anos
  rallytime 60370f5fb6 Merge branch '2017.7' into 'oxygen' %!s(int64=6) %!d(string=hai) anos
  Steve Weber 942c14bb29 pillar body overrides includes %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 683e2cc502 Rename 'environment' config option to 'saltenv' %!s(int64=7) %!d(string=hai) anos
  rallytime b8dc018178 Merge branch '2017.7' into 'develop' %!s(int64=7) %!d(string=hai) anos
  twangboy 00dbba5712 Fix `unit.test_pillar` for Windows %!s(int64=7) %!d(string=hai) anos
  Alexandru Bleotu 33feda7a5b Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests %!s(int64=7) %!d(string=hai) anos
  Alexandru Bleotu dc082a2087 pylint fix and fix when calling _external_pillar_data function %!s(int64=7) %!d(string=hai) anos
  Alexandru Bleotu a771dd94f3 Added tests for external pillar function calls %!s(int64=7) %!d(string=hai) anos
  Alexandru Bleotu 2090d9d32f Added tests for AsyncRemotePillar adding extra minion data from config %!s(int64=7) %!d(string=hai) anos
  Alexandru Bleotu 5b383f0036 Added tests for RemotePillar adding extra minion data from config %!s(int64=7) %!d(string=hai) anos
  Erik Johnson 3184168365 Use explicit unicode strings + break up salt.utils %!s(int64=7) %!d(string=hai) anos
  Andrew Pashkin b0148c15c7 Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file" %!s(int64=7) %!d(string=hai) anos
  Andrew Pashkin 7d59f7a6c6 Make possible to reference pillars, that come before current pillar in the top file %!s(int64=8) %!d(string=hai) anos
  Marlowe W d66281bda6 pillar: fix tests %!s(int64=7) %!d(string=hai) anos
  Pedro Algarvio abe608d739 Drop `@patch` usage %!s(int64=7) %!d(string=hai) anos
  Pedro Algarvio b25b26e23d Cleanup test attributes once finished %!s(int64=7) %!d(string=hai) anos