Mircea Ulinic
c843914045
Merge branch 'develop' into source-ip-port-opts
2017-12-06 14:46:44 +00:00
Daniel Wallace
0568acf2f7
clean up global docs
2017-12-05 16:20:58 -07:00
Daniel Wallace
9c604d7328
add docs for openstack driver
2017-12-05 16:09:31 -07:00
Daniel Wallace
f7d182871e
remove openstack driver
2017-12-05 16:09:30 -07:00
Nicole Thomas
48fbfd6e7a
Merge pull request #44814 from sypets/documentation-exec-modules
...
documentation: use term 'execution modules' instead of just 'modules'…
2017-12-05 17:49:18 -05:00
Nicole Thomas
8569287ecb
Merge pull request #44834 from BadgerOps/bugfix/fix_saltify_docs
...
fixed saltify documentation to refer to 'driver' instead of 'provider…
2017-12-05 16:36:07 -05:00
Nicole Thomas
b946ad3384
Merge pull request #43710 from amendlik/gpg-yaml-sdb
...
Add GPG support to YAML SDB module
2017-12-05 14:42:41 -05:00
BadgerOps
efc86b0eba
fixed saltify documentation to refer to 'driver' instead of 'provider' in provider example
2017-12-05 10:38:53 -07:00
Erik Johnson
ecd0a6a016
Add link to newly-merged docs section
2017-12-05 00:57:14 -06:00
Erik Johnson
abed8e5952
Add documentation / release notes
2017-12-05 00:57:14 -06:00
Adam Mendlik
3252f0655e
Update documentation for __salt__ in SDB modules
2017-12-04 17:41:49 -07:00
Nicole Thomas
8e2e1f957e
Merge pull request #44772 from terminalmage/issue36275
...
Rename environment config option to saltenv, introduce lock_saltenv option
2017-12-04 16:49:23 -05:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains
2017-12-04 16:10:32 -05:00
Sybille Peters
9070501118
documentation: use term 'execution modules' instead of just 'modules' for more clarity
...
Fixes #44707
2017-12-04 16:32:16 +01:00
Eric Radman
bf9dc026bb
Update salt_boostrap command line help summary
...
- Use exact indentation produced by the bootstrap-salt command
- normal package installs work fine on OpenBSD
2017-12-01 15:28:09 -05:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Nicole Thomas
3c0088b644
Merge branch 'develop' into source-ip-port-opts
2017-12-01 09:38:06 -05:00
Nicole Thomas
5c737100c4
Merge pull request #44726 from terminalmage/issue42188
...
Add __context__ to RunnerClient and WheelClient
2017-11-30 19:03:02 -05:00
Erik Johnson
bf8384d230
Add documentation for lock_saltenv
...
Also add documentation for renaming of environment to saltenv
2017-11-30 14:53:01 -06:00
chris ruscio
e2682bf441
Fix minion ping_interval documentation
2017-11-30 13:56:10 -05:00
Thomas S Hatch
52ab561c4c
Add some extra docs
2017-11-30 11:40:40 -07:00
Mircea Ulinic
f8d69dd0ba
Add thorium_roots configuration example
2017-11-30 12:50:29 +00:00
Mircea Ulinic
4610fb4e62
thorium_roots not thorium_roots_dir
2017-11-30 12:48:17 +00:00
Erik Johnson
0e37ad39c3
Add retcode documentation to orchestrate docs
2017-11-29 10:20:22 -06:00
Erik Johnson
ecdd273231
Add info about runner/wheel retcodes to Oxygen release notes
2017-11-29 09:47:56 -06:00
Gareth J. Greenaway
998d714ee7
Merge pull request #44517 from whytewolf/publish_port_doc_missing
...
Publish port doc missing
2017-11-28 13:50:18 -08:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
...
Update notes around grains topic, and salt.modules.grains and salt.state.grains
2017-11-27 16:33:37 -05:00
Nicole Thomas
9ea4ee1479
Merge pull request #44549 from cloudflare/fix-proxy-grains
...
Allow proxy minions to load static grains
2017-11-27 15:57:08 -05:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored.
...
only those set in the minion config
also update header of salt.modules.grains to more closely match what
states says in regard to this.
and tweak the note portion to stand out a bit more.
tweaked the state note to also stand out more
2017-11-22 15:17:45 -08:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/daemons.py
- salt/client/ssh/__init__.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/proxy/fx2.py
- salt/utils/__init__.py
- salt/utils/jinja.py
- salt/utils/napalm.py
- salt/utils/path.py
- salt/utils/verify.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_service.py
- tests/unit/utils/test_verify.py
2017-11-22 12:36:03 -05:00
Mircea Ulinic
f091ab28d1
Consitent doc, please!
2017-11-22 14:31:33 +00:00
Mircea Ulinic
c48db41cc4
Specify the right versions for pyzmq and libzmq
2017-11-22 14:30:08 +00:00
Mircea Ulinic
101e8f0837
Mention the new opts in the Oxygen release notes
2017-11-22 12:50:04 +00:00
Mircea Ulinic
db1e2b5bc6
Add versionadded notes
2017-11-22 12:38:21 +00:00
Mircea Ulinic
5e2d83264c
Document the new opts
2017-11-22 12:05:30 +00:00
rallytime
90d1cb221d
Add documentation about logging before modules are loaded
2017-11-20 09:05:49 -05:00
Roald Nefs
47147e2769
Added new Telegram module
...
Added a new Telegram module, which allows to send a message via Telegram
using the Telegram Bot API. The commit also includes:
- Update for the Telegram returner (merged in #44148 ); the Telegram
returner now fully utilizes the Telegram module.
- Update to the documentation in order to add the Telegram module to the
list list of all modules.
- Updated Telegram returner test.
- New Telegram module test.
2017-11-20 08:47:57 +01:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains
2017-11-17 19:35:53 +01:00
Daniel Wallace
5a8ba39dd7
Merge pull request #44052 from tylerjones4508/docker_util
...
Docker util
2017-11-15 08:51:11 -07:00
Mircea Ulinic
0320174ea4
Add doc note regarding static grains on proxy minions
2017-11-15 13:19:03 +00:00
Tyler Jones
3d77e27830
Merge branch 'develop' into docker_util
2017-11-14 18:25:33 -05:00
Nicole Thomas
4315c20195
Merge branch 'develop' into add-mandrill-mod
2017-11-14 17:29:52 -05:00
Nicole Thomas
2c6f8f5f9e
Merge pull request #44510 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-14 17:21:13 -05:00
Tyler Jones
b97bb46666
Merge branch 'develop' into docker_util
2017-11-14 13:08:36 -05:00
Mircea Ulinic
88c7992bc8
Doc ref the new mandrill exec mod
2017-11-14 11:24:54 +00:00
Nicole Thomas
91d46d4cfc
Merge pull request #44434 from whytewolf/1837
...
add a note that describes grain rebuilding on restart and refresh
2017-11-14 06:21:53 -05:00
Tyler Jones
9af65b6af2
fixing virtualname, and other small fixes
2017-11-14 01:35:16 +00:00
Tyler Jones
ae2bbd4d96
Fixing docs,versionadded,formating, and adding the salt.modules.swarm.rst file
2017-11-14 00:08:52 +00:00
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
