 Petr Michalec
|
87a11541e1
Merge branch 'develop' into pr/jinja_line_statements
|
7 years ago |
|
Nicole Thomas
|
1087a0a899
Merge pull request #42384 from letsmakesense/patch-1
|
7 years ago |
|
rallytime
|
1f0b90aa57
Merge branch '2017.7' into 'develop'
|
7 years ago |
|
rallytime
|
c673b64583
Merge branch '2016.11' into '2017.7'
|
7 years ago |
|
letsmakesense
|
b234f80308
state_top value also affects pillar top file
|
7 years ago |
|
rallytime
|
b40f980632
Add more documentation for config options that are missing from master/minion docs
|
7 years ago |
|
Petr Michalec
|
0373f90e86
Merge branch 'develop' into pr/jinja_line_statements
|
7 years ago |
|
Petr Michalec
|
c770ba3287
Extend Jinja options support (line statements)
|
7 years ago |
|
rallytime
|
8d960d463a
Merge branch '2017.7' into 'develop'
|
7 years ago |
|
Daniel Wallace
|
ea5ae2e468
add release note about about extmod blacklist and whitelist
|
7 years ago |
|
Erik Johnson
|
9a50e7c1ca
Merge remote-tracking branch 'upstream/2017.7' into merge-develop
|
7 years ago |
|
rallytime
|
e512a29f08
Merge branch '2017.7' into 'develop'
|
7 years ago |
|
rallytime
|
7d7be2d375
Merge branch '2016.11' into '2017.7'
|
7 years ago |
|
Mike Place
|
ff67d47a2e
Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection
|
7 years ago |
|
Erik Johnson
|
1279f56c56
gitfs: Add two new options to affect saltenv mapping
|
7 years ago |
|
rallytime
|
2cfabc467c
Merge branch '2016.11' into '2017.7'
|
7 years ago |
|
rallytime
|
4780e99ac2
Merge branch '2017.7' into 'develop'
|
7 years ago |
|
rallytime
|
c828ad803a
Add a bunch of config options to the various master/minion files that are missing
|
7 years ago |
|
Mike Place
|
a46f6809df
Merge pull request #41758 from twangboy/docs_win_add_master_config
|
7 years ago |
|
rallytime
|
7fef4cf38f
Merge branch '2017.7' into 'develop'
|
7 years ago |
|
twangboy
|
c3dc38587e
Fix indentation
|
7 years ago |
|
twangboy
|
80ac6381c2
Add Windows Master config information
|
7 years ago |
|
rallytime
|
c5b75d030a
Update Nitrogen references to 2017.7.0 in doc/*
|
7 years ago |
|
kstreee
|
94b9ea51eb
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
|
7 years ago |
|
rallytime
|
8c1dc36a8b
Merge branch 'nitrogen' into 'develop'
|
7 years ago |
|
rallytime
|
de85b49b90
Merge branch '2016.11' into 'nitrogen'
|
7 years ago |
|
David Boucha
|
5eb27571a0
Correct doc to actually blacklist a module
|
7 years ago |
|
rallytime
|
2ba9f644f6
Merge branch 'nitrogen' into 'develop'
|
7 years ago |
|
Mike Place
|
051259d469
Merge pull request #41218 from gtmanfred/roster
|
7 years ago |
|
Daniel Wallace
|
836ee32ff6
allow for syncing salt-ssh rosters on the master
|
7 years ago |
