Thomas Phipps
d148e39dda
change from md to rst for code reference
2017-11-13 15:15:13 -07:00
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942
...
Jinja line statements and comments
2017-11-13 12:02:16 -08:00
Thomas Phipps
4b5855283a
missed one place where i didnt chanbge master_port from my copy to publish_port
2017-11-13 12:21:34 -07:00
Nicole Thomas
93c54d9884
Merge pull request #44414 from garethgreenaway/req_any
...
[develop] Adding additional requisites to state compiler
2017-11-13 14:17:09 -05:00
Thomas Phipps
e4610baea5
update doc to have publish port
2017-11-13 12:14:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout
2017-11-13 11:49:30 -07:00
Mike Place
dd2844a645
Merge pull request #44196 from benediktwerner/develop
...
Fix autosign file permission check [develop]
2017-11-13 11:34:37 -07:00
Mike Place
f2aa3539ef
Merge branch 'develop' into accept-minions-from-grains
2017-11-13 11:13:50 -07:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .kitchen.yml
- tests/unit/test_doc.py
- tests/unit/utils/test_cloud.py
2017-11-13 12:27:59 -05:00
Gareth J. Greenaway
45c9a233dc
Merge branch 'develop' into req_any
2017-11-13 09:16:56 -07:00
Nicole Thomas
0c4bb0b7e0
Merge pull request #44486 from vitaliyf/patch-1
...
Fixed minor spelling mistake.
2017-11-10 12:15:53 -07:00
Mike Place
8391b34372
Merge pull request #44148 from roaldnefs/add-telegram-returner
...
Add Telegram returner
2017-11-10 12:04:30 -07:00
Nicole Thomas
9302149604
Merge branch 'develop' into develop
2017-11-10 10:56:12 -07:00
Vitaliy
43e4861fc4
Fixed minor spelling mistake.
2017-11-10 12:30:12 -05:00
Thomas Phipps
7256fcc1c9
update note to take into account grains_cache
2017-11-08 16:36:38 -08:00
Thomas Phipps
9cdeb4e903
update log-granular-levels to describe what they are filtering on
2017-11-08 16:11:46 -08:00
Gareth J. Greenaway
a8e495f18f
Updating documentation and release notes.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
3a71865c97
fixing docs per @rallytime
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
ca9e8a99b3
Replacing tabs with spaces.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
58d22a169c
Adding docs and integration tests.
2017-11-08 16:06:43 -08:00
Nicole Thomas
8e99aeed6a
Merge pull request #44415 from vernondcole/vagrant_cloud_minor_revisions
...
Vagrant and saltify cloud minor revisions
2017-11-08 15:22:18 -07:00
Erik Johnson
5932e8a8ae
Merge pull request #44407 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-08 11:50:05 -08:00
Nicole Thomas
dcdf2d4c90
Merge pull request #44429 from Ch3LL/orch_doc
...
Fix orch doc from pillat.get to pillar.get
2017-11-07 16:06:38 -07:00
Nicole Thomas
76f3c001ee
Merge pull request #44430 from thatch45/doc_fix1
...
make it clear that disabling the job cache is bad
2017-11-07 15:53:10 -07:00
Thomas Phipps
aca0405b26
add a note that describes grain rebuilding on restart and refresh
2017-11-07 14:51:32 -08:00
Nicole Thomas
a29eeeec66
Fix a couple of small spelling errors
2017-11-07 12:16:28 -07:00
Thomas S Hatch
bed56e9dd7
make it clear that disableing the job cache is bad
2017-11-07 10:14:40 -07:00
Ch3LL
38ca5520f0
Fix orch doc from pillat.get to pillar.get
2017-11-07 11:36:10 -05:00
Volodymyr Samodid
0c7f63e9d4
fix docstring errors during rendering
2017-11-07 10:24:56 +02:00
Vernon Cole
51a15cb2fc
try to ping node before Wake on Lan
2017-11-06 10:56:41 -07:00
rallytime
edbbd5fc2b
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- .kitchen.yml
- salt/modules/win_system.py
2017-11-05 20:56:44 -07:00
rallytime
2c052e34b3
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .gitignore
- salt/modules/win_lgpo.py
- salt/utils/__init__.py
- tests/integration/spm/test_build.py
- tests/unit/test_pydsl.py
2017-11-05 20:28:51 -07:00
Benedikt Werner
7bb85f417f
Merge branch 'develop' into develop
2017-10-31 23:15:03 +01:00
Mike Place
06afbe4214
Merge pull request #44275 from rallytime/arch-doc
...
Doc updates for architecture.rst file
2017-10-31 10:49:41 -06:00
Mike Place
d9a4cc22da
Merge pull request #44328 from rallytime/doc-fixes
...
Add some clarifications to event and architecture documentation
2017-10-31 10:21:37 -06:00
Rossen Georgiev
b18f2e5a6d
fix program name and description for --static
2017-10-30 15:10:11 +00:00
rallytime
0574df20ce
Add some clarifications to event and architecture documentation
2017-10-29 15:08:57 -04:00
Benedikt Werner
8f2693237c
Fixed and improved autoaccept grains docs
2017-10-29 14:02:36 +01:00
Benedikt Werner
d568c73c76
Prepend root dir config to autosign_grains_dir
2017-10-29 13:53:55 +01:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains
2017-10-29 13:53:49 +01:00
Rossen Georgiev
5b10918f02
updated CLI docs for salt-ssh
2017-10-28 10:54:47 +01:00
Nicole Thomas
9fc7fde8d2
Merge pull request #43885 from garethgreenaway/43825_swap_total_grain
...
[develop] Adding swap_total to core grains
2017-10-27 13:01:11 -04:00
Nasenbaer
35c6a02689
Add sentry config deprecation to release notes
2017-10-26 10:29:43 +02:00
David Boucha
c919648ab4
Fix documentation grammar and spelling errors
2017-10-25 17:24:26 -06:00
Federico Pires
e7aebf46ce
Support softlayer dedicated host in salt-cloud.
...
Update docs as well.
2017-10-25 10:58:12 -03:00
rallytime
fa7d290b7c
Doc updates for architecture.rst file
...
- A couple of spelling fixes
- Formatting fixes to make sure numbered lists display correctly
- Remove header that was confusing
2017-10-25 09:46:56 -04:00
Nicole Thomas
4278a08e40
Merge pull request #44194 from vernondcole/saltify-create-with-wake-on-lan
...
add wake-on-LAN feature to saltify create
2017-10-23 10:46:21 -04:00
Benedikt Werner
505b3e7b10
Added versionchanged tag
2017-10-21 01:10:06 +02:00
Benedikt Werner
53dd162729
Fixed grammar
2017-10-21 00:55:58 +02:00
Vernon Cole
b7c0182d93
correct and clarify documentation
2017-10-20 09:24:26 -06:00
Nicole Thomas
372b9f14b5
Merge pull request #43821 from bcelenk/opsgenie-modules
...
Add OpsGenie's execution and state modules
2017-10-20 09:16:47 -04:00
Benedikt Werner
295b5d4834
Added tests and doc
2017-10-20 06:02:08 +02:00
Vernon Cole
cea457efa0
more better documentation, fix parameter handling
2017-10-19 20:14:07 -06:00
Vernon Cole
d3769b3568
add saltify wake-on-lan and document it
2017-10-19 20:14:07 -06:00
Mike Place
866a78a673
Merge pull request #44176 from vernondcole/simplify-saltify
...
Simplify saltify cloud driver
2017-10-19 14:37:17 -05:00
Nicole Thomas
e52aac2587
Merge pull request #43649 from twangboy/win_installer_multimaster
...
Add support for multimaster setup
2017-10-19 09:20:44 -04:00
Gareth J. Greenaway
bcee88ce77
Adding note about new swap_total grain to release notes for Oxyten.
2017-10-18 14:57:32 -07:00
Vernon Cole
805d5106ed
remove references to salt-api from docs
2017-10-18 10:50:47 -06:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/opkg.py
- salt/utils/templates.py
- tests/unit/templates/test_jinja.py
2017-10-18 09:37:47 -04:00
Roald Nefs
1cd784300f
Add Telegram returner
...
Added Telegram returner and made a reference to the returner in
the documentation
2017-10-18 12:38:05 +02:00
Mike Place
73c3581864
Merge pull request #44037 from vernondcole/vagrant-cloud
...
Vagrant cloud and state modules
2017-10-17 14:36:38 -06:00
Nicole Thomas
6252f82f58
Merge pull request #44133 from cachedout/fix_paralell_docs
...
Fix typos in parallel states docs
2017-10-17 11:24:18 -04:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough
2017-10-16 20:27:56 -04:00
Mike Place
b651ff0534
Merge pull request #44129 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-16 16:48:16 -06:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs
2017-10-16 16:43:10 -06:00
Mike Place
6c3a500beb
Merge pull request #44060 from The-Loeki/doc-roster
...
doc fixes for salt-ssh roster(s) opts
2017-10-16 14:12:40 -06:00
Nicole Thomas
2fba45cd3f
Merge pull request #44125 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.2 to 2017.7
2017-10-16 16:02:24 -04:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop'
...
Conflicts:
- doc/topics/tutorials/index.rst
- salt/crypt.py
- salt/modules/cmdmod.py
- salt/modules/grains.py
- salt/pillar/git_pillar.py
- salt/roster/clustershell.py
- tests/unit/states/test_augeas.py
- tests/unit/utils/test_utils.py
2017-10-16 15:26:19 -04:00
Nicole Thomas
96dc6b0171
Merge pull request #44015 from gtmanfred/develop
...
convert jinja context to dictionary
2017-10-16 14:39:29 -04:00
Nicole Thomas
888e5f51a2
Merge pull request #44121 from benediktwerner/2017.7
...
Fixed code snippet in unit testing documentation
2017-10-16 14:28:36 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.2.rst
2017-10-16 13:53:13 -04:00
twangboy
a0972704e5
Fix bad headings
2017-10-16 10:51:34 -06:00
twangboy
601d8bc5af
Add release notes
2017-10-16 10:51:34 -06:00
twangboy
e22b2a4856
Fix some grammer issues in the docs
2017-10-16 10:51:33 -06:00
twangboy
78124181cd
Fix typo
2017-10-16 10:51:33 -06:00
twangboy
7bcf8b48ec
Update documentation with new changes to installer
2017-10-16 10:51:33 -06:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc
2017-10-16 17:23:23 +02:00
rallytime
bbec47afbc
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/utils/aws.py
2017-10-16 08:57:50 -04:00
Erik Johnson
877abb89d0
Complete the salt.utils refactor
...
This moves the remaining 30 functions from salt.utils to new locations.
2017-10-15 09:43:31 -05:00
garethgreenaway
22dbed1e45
Merge branch 'develop' into vagrant-cloud
2017-10-13 13:08:50 -07:00
Nicole Thomas
76cc5ba689
Merge branch 'develop' into develop
2017-10-13 11:44:17 -04:00
Nicole Thomas
b617c85519
Merge pull request #44084 from senthilkumar-e/doc_update
...
Fixing a typo in the troubleshooting document
2017-10-13 10:29:50 -04:00
Nicole Thomas
0238a6d713
Merge pull request #44061 from Shinzu/develop
...
Add option to eagerly scrub the disk
2017-10-13 09:57:02 -04:00
Senthilkumar Eswaran
238941cd02
Fixing a typo in the troubleshooting document
2017-10-12 22:28:25 -07:00
Vernon Cole
42c0c6e6ef
lint and documentation fixes
2017-10-12 13:11:12 -06:00
Markus
820add5551
Added version tag
2017-10-12 20:30:55 +02:00
Nicole Thomas
18dfc1967d
Merge pull request #43849 from kkoch986/develop
...
Add support for tagging newly created DigitalOcean droplets.
2017-10-12 11:35:29 -04:00
Nicole Thomas
a85837d72b
Merge pull request #44066 from Ch3LL/cherry_release
...
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 09:33:59 -04:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk
2017-10-12 13:43:27 +02:00
Ronald van Zantvoort
e555b6351b
doc fixes for salt-ssh roster(s) opts
2017-10-12 11:42:23 +02:00
Ken Koch
ecda3277d3
Merge branch 'develop' of github.com:kkoch986/salt into develop
2017-10-11 21:14:36 -04:00
Ken Koch
067d4a5dd2
change tags to list based in config
2017-10-11 21:14:27 -04:00
Mike Place
24b9f21456
Merge pull request #43831 from eradman/vmm_grain
...
Detect OpenBSD guest running under VMM(4)
2017-10-11 17:19:52 -06:00
Daniel Wallace
41c086faf7
convert jinja context to dictionary
...
For `show_full_context`, it is useful to have this as a serializable dictionary so that it can be dumped and actually parsed using
`{{show_full_context|yaml(False)}}`
2017-10-11 10:24:34 -06:00
Nicole Thomas
3a078304d8
Merge pull request #43982 from terminalmage/salt.utils.data
...
Move 13 functions from salt.utils to salt.utils.data
2017-10-11 11:42:08 -04:00
Vernon Cole
e9c7c69402
documentation for vagrant cloud & state
2017-10-11 05:02:26 -06:00
Vernon Cole
4cdb04b409
documentation for vagrant cloud & state
2017-10-11 04:49:47 -06:00
garethgreenaway
f3699ade0a
Merge branch 'develop' into vagrant-module
2017-10-10 17:07:20 -07:00
Erik Johnson
d947ddf176
Move 13 functions from salt.utils to salt.utils.data
...
These functions are:
- salt.utils.compare_dicts
- salt.utils.compare_lists
- salt.utils.decode_dict
- salt.utils.decode_list
- salt.utils.exactly_n
- salt.utils.exactly_one
- salt.utils.traverse_dict
- salt.utils.filter_by
- salt.utils.traverse_dict_and_list
- salt.utils.subdict_match
- salt.utils.substr_in_list
- salt.utils.is_dictlist
- salt.utils.repack_dictlist
2017-10-10 17:42:42 -05:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-10-10 16:34:52 -04:00
David A. Pocock
385980c21a
Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo
2017-10-10 15:06:18 -05:00
David A. Pocock
266dc00a23
Typo correction of lover to lower
2017-10-10 15:04:00 -05:00
Nicole Thomas
d61300df20
Merge pull request #44023 from Ch3LL/11.9rn
...
Add 2016.11.9 Release Note File
2017-10-10 16:03:01 -04:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File
2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File
2017-10-10 15:31:19 -04:00
Benedikt Werner
bc53598027
Fixed spelling mistake in salt_bootstrap tutorial
2017-10-10 19:03:07 +02:00
Benedikt Werner
6c30344824
Added missing tutorial docs to the tutorial index
2017-10-10 19:02:35 +02:00
Benedikt Werner
c5dde87d88
Renamed digitalocean cloud module doc file
2017-10-10 18:55:06 +02:00
Nicole Thomas
33e0353858
Merge branch 'develop' into vmm_grain
2017-10-10 09:01:33 -04:00
Mike Place
e434c39c4e
Merge pull request #43960 from cro/ldap_nopw_bind2
...
Require that bindpw be non-empty when auth.ldap.anonymous is False
2017-10-09 17:09:01 -06:00
garethgreenaway
e9dfda2177
Merge pull request #43991 from Ch3LL/3.8_sec_2
...
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 15:00:24 -07:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 16:26:13 -04:00
Mike Place
efbe49fe60
Merge branch 'develop' into vagrant-module
2017-10-09 11:43:42 -06:00
garethgreenaway
80d258be0c
Merge pull request #43775 from Ch3LL/develop_docs
...
[develop] Bump latest and previous versions
2017-10-09 10:22:27 -07:00
garethgreenaway
8d56a5ac45
Merge pull request #43776 from Ch3LL/2016.11.8_docs
...
[2016.11] Bump latest and previous versions
2017-10-09 10:22:14 -07:00
garethgreenaway
a4358dfa36
Merge pull request #43777 from Ch3LL/2017.7.2_docs
...
[2017.7] Bump latest and previous versions
2017-10-09 10:21:56 -07:00
Ch3LL
57fd6f7bcb
Add Security Notes to 2017.7.2 Release Notes
2017-10-09 13:09:58 -04:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes
2017-10-09 13:03:23 -04:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False
2017-10-06 15:41:07 -06:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements
2017-10-06 15:33:10 -06:00
Daniel Wallace
1f8ec5d335
Merge branch 'develop' into vagrant-module
2017-10-06 11:32:31 -06:00
Nicole Thomas
7785919437
Merge pull request #43829 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-05 16:09:23 -04:00
Nicole Thomas
f880ac4c08
Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway
...
Fix typo in salt-cloud scaleway documentation
2017-10-05 14:57:59 -04:00
garethgreenaway
37d7f13926
Merge branch 'develop' into vagrant-module
2017-10-05 10:25:24 -07:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/modules/test_state.py
2017-10-05 12:09:40 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation
...
s/scalewa/scaleway
2017-10-04 23:23:00 +00:00
Bener Celenkoglu
13f29b4010
Merge branch 'develop' into opsgenie-modules
2017-10-04 10:41:58 +03:00
David Boucha
8c671fd0c1
Update SaltConf banner per Rhett's request
2017-10-03 10:07:28 -06:00
Eric Radman
1a9f12fd67
Detect OpenBSD guest running under VMM(4)
...
grains.manufacturer is 'OpenBSD' when running under VMM
2017-10-02 17:45:37 -04:00
rallytime
2337904656
Add updated release notes to 2017.7.2 branch
2017-10-02 17:18:30 -04:00
Damian Wiest
76cd070e2d
Fixed Jinja typo in faq.rst
...
A closing curly brace was missing in the first block of Jinja code under the "Restart using states" section.
2017-10-02 10:15:02 -05:00
Bener
5df8e59796
Add OpsGenie's execution and state modules
2017-10-02 13:37:41 +03:00
Corvin Mcpherson
c67db52c73
Merge branch 'develop' into issue36942
2017-10-01 18:56:58 -04:00
Corvin Mcpherson
111df31057
Fix english error in jinja_sls_env documentation
2017-10-01 17:02:03 -04:00
Corvin Mcpherson
470265ee03
Merge branch 'pr41538' into issue36942
2017-10-01 16:36:11 -04:00
Corvin Mcpherson
19dcfcf1a0
Add jinja_env and jinja_sls_env master configuration options documentation
2017-10-01 14:36:15 -04:00
Nicole Thomas
9f25a1c2dd
Merge pull request #43503 from The-Loeki/high-out-by_id
...
Additional highstate output modes; changes_id, filter_id, terse_id, full_id
2017-10-01 10:14:26 -04:00
Ken Koch
c208f0ac39
Merge branch 'develop' into develop
2017-10-01 08:17:43 -04:00
Ken Koch
57a624d86b
Add support for tagging newly created DigitalOcean droplets.
...
Signed-off-by: Ken Koch <kkoch986@gmail.com>
2017-10-01 07:53:07 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/master.py
- salt/utils/path.py
- tests/unit/modules/test_state.py
2017-09-29 11:48:33 -04:00
Mike Place
952b5d8e87
Merge branch 'develop' into vagrant-module
2017-09-29 12:34:41 +02:00
garethgreenaway
61280cc0c3
Merge branch 'develop' into release-note-formatting
2017-09-28 19:49:12 -07:00
Nicole Thomas
3f77571dad
Merge branch 'develop' into high-out-by_id
2017-09-28 13:27:47 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6
2017-09-28 11:50:54 -04:00
Simon Dodsley
cdafbe2068
Update Oxygen Release notes with new grains and module
...
Also do a final cosmetic fix to the purefa module documentation
2017-09-28 07:26:30 -07:00
rallytime
d862a6f3f2
Fix some formatting issues on the oxygen release notes page
2017-09-28 09:52:04 -04:00
Mike Place
6a25bf4475
Merge pull request #42349 from coredumb/saltclass
...
New pillar/master_tops saltclass module
2017-09-28 14:26:45 +02:00
vernoncole
f82ec9e72d
Revert "Oxygen release notes for vagrant and saltify drivers"
...
This reverts commit afbfe86
2017-09-27 14:59:47 -06:00
vernoncole
a1a81eb906
supply Vagrant documentation
2017-09-27 14:59:47 -06:00
vernoncole
52acfd980d
merge upstream develop
2017-09-27 14:26:32 -06:00
Ch3LL
9ba51646e0
[develop] Bump latest and previous versions
2017-09-27 12:31:20 -04:00
Ch3LL
410c624f7a
[2017.7] Bump latest and previous versions
2017-09-27 12:25:30 -04:00
Ch3LL
f72bc00000
[2016.11] Bump latest and previous versions
2017-09-27 12:24:09 -04:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99
Merge pull request #43761 from Ch3LL/release_2017.7.2
...
Release Notes for 2017.7.2
2017-09-27 10:34:51 -04:00
Ch3LL
caf5795856
add mac patch notes
2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes
2017-09-26 17:21:24 -04:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/daemons/masterapi.py
- salt/master.py
- salt/runners/cache.py
2017-09-26 16:46:43 -04:00
Erik Johnson
74379bac9c
Merge pull request #43720 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-26 09:53:04 -05:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
...
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
Thomas S Hatch
d8f371b8b1
Merge pull request #43669 from moio/develop-limit-minion-processes
...
Introduce process_count_max minion configuration parameter (develop)
2017-09-26 05:56:11 -06:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
...
Fixes #43650
The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
Ronald van Zantvoort
a2234e45e2
Update release note docs regarding _id highstate output modes
2017-09-25 18:37:48 +02:00
Ronald van Zantvoort
bfbca748e2
highstate output: Document additional output modes
2017-09-25 18:32:52 +02:00
rallytime
281cbbe048
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cloud/clouds/libvirt.py
- salt/daemons/masterapi.py
- salt/modules/file.py
- salt/modules/yumpkg.py
- salt/states/archive.py
- salt/states/file.py
- salt/utils/files.py
- salt/utils/minions.py
2017-09-25 09:40:18 -04:00
garethgreenaway
7091f8ec71
Merge branch 'develop' into issue36942
2017-09-22 16:33:29 -07:00
Silvio Moioli
fd4194ade0
process_count_max: disable by default
2017-09-22 21:57:54 +02:00
Silvio Moioli
4d181ea523
process_count_max: add defaults and documentation
2017-09-22 21:57:02 +02:00
Mike Place
3a79549af4
Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex
...
Bugs/43124 users regex
2017-09-22 13:21:08 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop'
...
Conflicts:
- pkg/salt.bash
- salt/client/mixins.py
- salt/minion.py
- salt/modules/aptpkg.py
- salt/modules/boto_vpc.py
- salt/modules/win_pkg.py
- salt/utils/reactor.py
- tests/unit/utils/test_reactor.py
2017-09-22 10:24:04 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- tests/unit/utils/test_parsers.py
2017-09-22 09:40:03 -04:00
Mike Place
ff832ee607
Merge pull request #43673 from rallytime/bp-43652
...
Back-port #43652 to 2016.11
2017-09-21 10:37:35 -06:00
Mike Place
365cb9fba8
Merge pull request #43677 from terminalmage/runners-docs-2016.11
...
Fix RST headers for runners (2016.11 branch)
2017-09-21 10:35:56 -06:00
rallytime
bd88c375d8
Add autodoc file for new purefa execution module
2017-09-21 11:51:15 -04:00
Erik Johnson
c0a79c70a4
Fix RST headers for runners (2017.7 branch)
...
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
2017-09-21 10:27:12 -05:00
Erik Johnson
2fd88e94fa
Fix RST headers for runners (2016.11 branch)
...
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
2017-09-21 10:11:28 -05:00
Raymond Piller
d91c47c6f0
Salt Repo has Deb 9 and 8
2017-09-21 10:24:41 -04:00
Nicole Thomas
f66eb1c5ad
Merge pull request #43588 from gtmanfred/do
...
digitalocean should be one word.
2017-09-21 09:25:38 -04:00
Nicole Thomas
f4eac59d96
Merge pull request #43652 from VertigoRay/patch-1
...
Salt Repo has Deb 9 and 8
2017-09-21 09:19:27 -04:00
Silvio Moioli
4a35fe5019
multiprocessing minion option: documentation fixes
2017-09-21 11:30:21 +02:00
Silvio Moioli
625eabb83f
multiprocessing minion option: documentation fixes
2017-09-21 10:55:52 +02:00
Raymond Piller
5f47ef721c
Salt Repo has Deb 9 and 8
2017-09-20 21:41:08 -05:00
Daniel Wallace
afaf76d0ba
add release note
2017-09-19 12:50:50 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word.
...
Everything on their webpage is a reference to DigitalOcean
2017-09-19 12:47:16 -06:00
rallytime
57b9d642c2
Merge branch '2016.11.8' into '2016.11'
...
No conflicts.
2017-09-18 16:40:05 -04:00
Erik Johnson
b5f10696c2
Improve the reactor documentation
...
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
2017-09-18 16:07:36 -04:00
Erik Johnson
7a2f12b96a
Include a better example for reactor in master conf file
2017-09-18 16:07:36 -04:00
Mike Place
1a619708c1
Enhance engines docs
...
Add a note about formatting to make it more clear.
2017-09-18 13:44:44 -06:00
Mike Place
56b671e087
Merge pull request #43330 from terminalmage/issue43077
...
Fix reactor regression + unify reactor config schema
2017-09-18 10:46:10 -06:00
Dmitry Kuzmenko
14bf2dd8ff
Support regex in publisher_acl.
2017-09-18 18:38:44 +03:00
Mircea Ulinic
40f36c9915
Merge branch 'develop' of github.com:saltstack/salt into napalm-beacon
2017-09-18 10:30:49 +00:00
haam3r
58f7d051c9
Issue #43479 No runners.config in 2017.7 branch
...
Add extra note about needing to import the runners.config module from the develop branch when running on a 2017.7 release.
2017-09-14 23:01:53 +03:00
Damon Atkins
b3dbafb035
Update doco
2017-09-14 12:28:23 -04:00
Damon Atkins
d4981a2717
Update doco
2017-09-14 12:25:30 -04:00
rallytime
bfcfcd75e8
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/fileclient.py
- salt/loader.py
- salt/minion.py
- salt/modules/alternatives.py
- salt/modules/genesis.py
- tests/unit/modules/test_hosts.py
- tests/unit/modules/test_ini_manage.py
2017-09-13 15:15:04 -04:00
Mike Place
9767e46ce4
Merge branch 'develop' into cisc_oxygen_release_notes
2017-09-13 10:45:24 -06:00
Erik Johnson
b85c8510c7
Improve the reactor documentation
...
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
2017-09-13 10:35:23 -05:00
Erik Johnson
20f6f3cc39
Include a better example for reactor in master conf file
2017-09-13 10:35:23 -05:00
Mike Place
15ffecd4a7
Give the name of the roster
2017-09-12 15:44:26 -06:00
