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
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
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
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
Thomas S Hatch
52ab561c4c
Add some extra docs
2017-11-30 11:40:40 -07:00
Erik Johnson
0e37ad39c3
Add retcode documentation to orchestrate docs
2017-11-29 10:20:22 -06: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
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
Daniel Wallace
5a8ba39dd7
Merge pull request #44052 from tylerjones4508/docker_util
...
Docker util
2017-11-15 08:51:11 -07: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
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
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942
...
Jinja line statements and comments
2017-11-13 12:02:16 -08: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
Mike Place
dd2844a645
Merge pull request #44196 from benediktwerner/develop
...
Fix autosign file permission check [develop]
2017-11-13 11:34:37 -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
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
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
Volodymyr Samodid
0c7f63e9d4
fix docstring errors during rendering
2017-11-07 10:24:56 +02: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
Benedikt Werner
7bb85f417f
Merge branch 'develop' into develop
2017-10-31 23:15:03 +01:00
Rossen Georgiev
b18f2e5a6d
fix program name and description for --static
2017-10-30 15:10:11 +00:00
Rossen Georgiev
5b10918f02
updated CLI docs for salt-ssh
2017-10-28 10:54:47 +01: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
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
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
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
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
rallytime
bbec47afbc
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/utils/aws.py
2017-10-16 08:57:50 -04:00
Ronald van Zantvoort
e555b6351b
doc fixes for salt-ssh roster(s) opts
2017-10-12 11:42:23 +02: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
