valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,054 Commits 24 Branches 182 Tags 341 MiB
87e20fd9a0
Commit Graph

8454 Commits

Author SHA1 Message Date
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05:00
Mike Place
b94e0a01ac
Merge pull request #50055 from rallytime/bp-50024 
Back-port #50024 to 2018.3
 2018-10-16 11:14:06 +02:00
Mike Place
14f3fac0c4
Merge pull request #50056 from rallytime/bp-50029 
Back-port #50029 to 2018.3
 2018-10-16 11:12:58 +02:00
Daniel Wallace
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots 
Make Pillar no longer munge file_roots
 2018-10-15 16:58:08 -05:00
rallytime
1eaaab705f
Doc title formatting must match doc name length 2018-10-15 16:55:35 -04:00
Christian McHugh
6ac26b6c1e
add saltclass docs from release notes 2018-10-15 16:54:20 -04:00
rallytime
1b5b018da2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/minion.py
  - salt/states/lvm.py
 2018-10-15 13:13:57 -04:00
Cody Crawford
2e46a783c5
Expose docs for Ansible modules 2018-10-15 13:01:22 -04:00
rwaweber
1ea72a00aa
docs: Correct spelling mistake and smooth out sentence 2018-10-15 12:58:28 -04:00
rallytime
e3a0f7b6f2
Add gce fix to 2017.7.9 release notes 2018-10-15 11:03:06 -04:00
Joachim Gleissner
e6d86fca91
document GCE instance credentials configuration 2018-10-15 11:02:25 -04:00
rallytime
f8e73e8ae2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/beacons/inotify.py
 2018-10-10 15:13:23 -04:00
Erik Johnson
58f5fde03c
Make Pillar no longer munge file_roots 
Pillar and the local fileclient used to use the same class, but this
changed a few years ago with the introduction of FSClient (which enabled
non-roots fileserver backends in masterless Salt). Since Pillar is the
only thing that uses this client, there is no longer a reason to make
Pillar modify file_roots.
 2018-10-10 13:10:50 -05:00
rallytime
32e7d90384
Add 2018.3.4 release notes file 2018-10-10 10:14:29 -04:00
rallytime
6c00003fd8
Add 2017.7.9 release notes file 2018-10-10 10:12:26 -04:00
rallytime
216fd64013
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation 
Fixes #49925

The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options
were removed in #38723. (They are obsolete and not used within salt any longer.)

When those options were removed, I neglected to remove them from the docs. This
PR cleans up the references in the docs.
 2018-10-08 10:51:01 -04:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
 2018-10-02 15:09:51 -04:00
Paulo-Nunes
fb6f81835a Edit requisite documentation 
Fixes #49836
 2018-10-01 21:08:49 -04:00
Nicole Thomas
ec978061aa
Merge pull request #49764 from garethgreenaway/49520_multimaster_dns_issue_fix 
[2018.3] Adding retry_dns_count to minion
 2018-10-01 10:20:02 -04:00
rallytime
81b0aa7099
Add "in progress" notation back to the 2018.3.3 release notes 
This has been removed in the 2018.3.3 branch for release prep, but the docs
on the main website still need to say this is in progress until we release.
 2018-10-01 09:17:50 -04:00
rallytime
0e761036f1
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-09-30 12:39:44 -04:00
Gareth J. Greenaway
741928bfee
Fixes per request from @rallytime. 2018-09-27 08:44:06 -07:00
Gareth J. Greenaway
e66dc18805
Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up. 2018-09-27 08:44:06 -07:00
Megan Wilhite
0b254373b1
Merge pull request #49743 from Ch3LL/8.3_in_progress 
Remove In Progress note for 2018.3.3 release
 2018-09-21 16:33:17 -04:00
Megan Wilhite
f2810b8736
Merge pull request #49742 from Ch3LL/man_8.3 
Update man pages for 2018.3.3
 2018-09-21 16:32:54 -04:00
Ch3LL
3043b0890f
Remove In Progress note for 2018.3.3 release 2018-09-21 16:28:49 -04:00
Ch3LL
a418ef87b1
Update man pages for 2018.3.3 2018-09-21 16:18:36 -04:00
Ch3LL
aef85d3b3f
Add Changelog for 2018.3.3 2018-09-21 14:22:04 -04:00
Erik Johnson
8393560642
Add warning about using jinja filters to dump dicts in Jinja 2018-09-20 14:56:26 -05:00
rallytime
b39dacf06c
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/pillar/cmd_yamlex.py
 2018-09-18 10:08:16 -04:00
Erik Johnson
7e5bab78c5
Fix docs build errors (2017.7 branch) 2018-09-17 22:35:08 -06:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py
 2018-09-06 12:08:01 -04:00
rallytime
de7ef3d681
Add "in progess" notation back to 2017.7.8 release notes 
We need this notation in the branch for now. We will remove it once the release
is live.
 2018-09-05 09:39:14 -04:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
Ch3LL
d40b6444a1
Update 2017.7.8 ChangeLog with new fixes 2018-09-04 17:28:50 -04:00
rallytime
2317b5ef58
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py
 2018-09-04 12:01:38 -04:00
rallytime
d1e51db8d3
Remove references to unused milestones in docs 2018-08-30 15:12:34 -04:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Erik Johnson
7372e9d6e3
Add minion documentation for enable_gpu_grains 2018-08-28 11:40:14 -05:00
Erik Johnson
ea1b53cb6f
Fix incorrect master docs for enable_gpu_grains 2018-08-28 11:39:53 -05:00
Erik Johnson
d1b7fb449c
Revert "Update documentation to correctly state enable_gpu_grains default" 
This reverts commit 2fe675cfdd.
 2018-08-28 11:17:32 -05:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Mike Place
f8c55b85e1
Merge pull request #49184 from ralish/external_nodes_docs 
Remove obsolete documentation on external_nodes setting
 2018-08-18 08:50:10 -04:00
Samuel D. Leslie
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default 
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.
 2018-08-18 13:47:53 +10:00
Samuel D. Leslie
2e29b292bf
Remove obsolete documentation on external_nodes setting 
This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
 2018-08-18 13:11:02 +10:00
Ch3LL
f6b70bb653
Add changelog to 2017.7.8 release notes 2018-08-14 10:11:45 -04:00
Nicole Thomas
6942ef1102
Merge pull request #49096 from rallytime/new-doc-img-2018.3 
Update the DOCBANNER image for saltconf
 2018-08-13 15:59:38 -04:00
rallytime
75080705ce
Update the DOCBANNER image for saltconf 2018-08-13 15:56:44 -04:00
rallytime
90954203cb
Update the DOCBANNER image for saltconf 2018-08-13 15:10:56 -04:00
Nicole Thomas
98a8da728b
Revert "New logo 2017.7 (WIP)" 2018-08-10 17:22:03 -04:00