 rallytime
|
0eab0ee8a6
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
Nicole Thomas
|
6942d5d95b
Merge pull request #37995 from rallytime/merge-2016.3
|
8 years ago |
|
rallytime
|
b44e17921c
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Denys Havrysh
|
7d9bc9abce
syndic_master: correct default value, documentation and example config
|
8 years ago |
|
Erik Johnson
|
61ed9a8657
Add clarifying language to ext_pillar_first docs
|
8 years ago |
|
Erik Johnson
|
6135dfa4dd
Revert addition of pillar_roots_override_ext_pillar
|
8 years ago |
|
Mike Place
|
ea46639ce7
Merge pull request #37272 from vutny/fix-getting-default-logging-opts
|
8 years ago |
|
Eric Radman
|
3f2e13d1fc
Remove repeated words in docs (#37871)
|
8 years ago |
|
rallytime
|
ce384b5009
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
Dmitry Kuzmenko
|
6857b9b8b1
Documented new TLS/SSL settings.
|
8 years ago |
|
Denys Havrysh
|
83d6a44254
Add `ssh_log_file` option to master config and documentation
|
8 years ago |
|
Denys Havrysh
|
c8a0915460
Fix configuration example and documentation for `syndic_log_file` option
|
8 years ago |
|
rallytime
|
7b2341bbfd
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
5ead1425d7
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Jonathan Ballet
|
89b9417605
Documentation rendering fixes (#37543)
|
8 years ago |
|
rallytime
|
8d3957f250
Merge branch 'carbon' into 'develop'
|
8 years ago |
|
rallytime
|
c722a18468
Update Carbon versionadded tags to 2016.11.0 in doc/*
|
8 years ago |
|
rallytime
|
f73bdf55c2
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
rallytime
|
5d7b4e4511
Merge branch 'carbon' into 'develop'
|
8 years ago |
|
Yoram Hekma
|
3bb2cb6379
Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy
|
8 years ago |
|
rallytime
|
112903ad7e
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Mike Place
|
7e0a1cdab8
Merge pull request #36293 from isbm/isbm-thin-modules-config
|
8 years ago |
|
rallytime
|
da574e5b03
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Bo Maryniuk
|
419819e92a
Add documentation about thin-min configuration
|
8 years ago |
|
Yoram Hekma
|
308d542742
Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy
|
8 years ago |
|
Bo Maryniuk
|
a441b35588
Add documentation about Salt Thin configuration
|
8 years ago |
|
Mike Place
|
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop
|
8 years ago |
|
rallytime
|
d5bbd91c14
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Nicole Thomas
|
5548ed771d
Back-port #36435 to 2016.3 (#36532)
|
8 years ago |
|
rallytime
|
d0ec4ead2a
Merge branch '2016.3' into 'carbon'
|
8 years ago |
