valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,076 Commits 24 Branches 182 Tags 341 MiB
93be4c10cf
Commit Graph

5188 Commits

Author SHA1 Message Date
rallytime
e0ffa32b49
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/integration/modules/test_pkg.py
 2018-01-19 10:09:36 -05:00
Nicole Thomas
28554ca935
Merge pull request #45389 from DSRCorporation/bugs/42626_pub_acl_doc 
Docs update for function args limit in pub acl.
 2018-01-18 17:56:10 -05:00
Nicole Thomas
3dc3e4e690
Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix 
Isbm ssdp spurious errors fix
 2018-01-18 07:07:01 -05:00
rallytime
4b64a3964e
Update function new name in release notes 2018-01-17 12:45:12 -05:00
Nicole Thomas
9a0ec9c30f
Merge pull request #45449 from rallytime/merge-develop 
[develop] Merge forward from oxygen to develop
 2018-01-17 12:35:27 -05:00
Dmitry Kuzmenko
f33ebcada0
Doc note about user names regex matching in pub acl and eauth. 2018-01-17 17:49:19 +03:00
Denys Havrysh
0d79b9eaff
[DOC] Suggest to upgrade pygit2 and deps 2018-01-17 15:24:15 +02:00
mds1455975151
b772689191 Correction of cachedir error 2018-01-17 08:57:54 +08:00
rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7' 2018-01-16 17:19:08 -05:00
Dmitry Kuzmenko
e29c0ff19e
Docs update for function args limit in pub acl. 2018-01-16 23:02:28 +03:00
Bo Maryniuk
59df24fc02 Docs update 2018-01-15 14:31:25 +01:00
Bo Maryniuk
b1bd992b1e Add more doc fixes 2018-01-15 14:31:25 +01:00
Bo Maryniuk
5cc6daae09 Fix doc typos 2018-01-15 14:31:25 +01:00
Bo Maryniuk
b1b48f89db Update autodiscovery documentation 2018-01-15 14:31:25 +01:00
rallytime
d76813d30d
Merge branch 'oxygen' into 'develop' 
Conflicts:
 - salt/modules/swarm.py
 2018-01-14 10:47:45 -05:00
Mircea Ulinic
6816e4f290
Document the utils refactor 2018-01-14 08:31:16 -05:00
Nicole Thomas
4d03162227
Merge pull request #45396 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-14 07:44:37 -05:00
Nicole Thomas
1755af821d
Merge pull request #44866 from DSRCorporation/slots3 
Slots: use execution function return as a state arg value
 2018-01-12 13:58:16 -05:00
rallytime
ec50759409
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/cloud/clouds/profitbricks.py
 2018-01-11 16:04:22 -05:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -05:00
Damon Atkins
10a7501ede
Update release notes 2018-01-12 03:11:07 +11:00
Dmitry Kuzmenko
c205c10e89
Added Slots release note. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
fe87704ff2
Slots: @terminalmage code review fixes. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
b55bba0d46
Slots documentation. 2018-01-11 14:05:58 +03:00
Mircea Ulinic
7fad2f8c0c Document the utils refactor 2018-01-11 09:59:38 +00:00
rallytime
f65e091df8
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-01-10 10:15:19 -05:00
Erik Johnson
ef76bc6fcd
Update documentation for update intervals feature 2018-01-09 19:11:17 -06:00
Gareth J. Greenaway
edfc3dc078
Adding in documention for auth_events configuration option 2018-01-05 12:29:21 -08:00
Nicholas Hughes
730ab15495
Merge branch 'develop' into add-azurearm-govcloud-support 2018-01-05 14:27:01 -05:00
denza
a5db21eab8 Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4 2018-01-05 06:13:48 +01:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/client/ssh/wrapper/state.py
  - salt/modules/yumpkg.py
 2018-01-04 17:45:29 -05:00
Damon Atkins
325a9f0f66
Update 2016.11.9.rst 2018-01-05 01:51:14 +11:00
Damon Atkins
4da9200b9c
Update 2016.11.9.rst 2018-01-05 01:46:20 +11:00
Damon Atkins
126aee36ac
Update 2016.11.9.rst 2018-01-05 01:38:22 +11:00
Damon Atkins
1c01967943
Update 2016.11.9.rst 2018-01-05 01:36:57 +11:00
sumeetisp
1b4806e2b9
Updating python version 
As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency
 2018-01-04 10:56:56 +05:30
denza
f21e04143b Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4 2018-01-03 22:18:03 +01:00
rallytime
69a38ae07f
Add Fluorine release notes file 2018-01-02 14:59:41 -05:00
denza
522cc4cee6 Doc update, ref should be used instead of doc 2017-12-28 23:13:57 +01:00
nicholasmhughes
e07c29f5fa
updated documentation for ssh private key parameter 2017-12-28 14:20:12 -05:00
nicholasmhughes
0ab05f7693
revert public key parameter name change in documentation 2017-12-28 13:47:15 -05:00
nicholasmhughes
f2650f48a3
update documentation 2017-12-28 13:39:18 -05:00
Daniel Wallace
38aeb7ad5f
add enable_ssh documentation 2017-12-28 07:49:05 -07:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly 
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
 2017-12-27 09:30:58 -06:00
denza
a753f641c4 Merge 2017-12-25 05:52:55 +01:00
denza
3407b272c0 ProfitBricks CloudAPI v4 updates 2017-12-22 05:38:46 +01:00
twangboy
467013a08f
Fix punctuation and erroneous characters 2017-12-21 13:11:24 -07:00
twangboy
50b247a001
Update docs and help 2017-12-20 19:43:26 -07:00
twangboy
42607982cb
Update docs for new support 
Fix some types in the help for the installer
 2017-12-19 11:10:05 -07:00
Jeremy McMillan
d1bc6fc3f9
Merge branch 'develop' into macports 2017-12-18 21:31:09 -06:00
Jeremy McMillan
1e9e70720f
update macports doc, portfile 2017-12-18 21:09:54 -06:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2017-12-16 08:16:57 -05:00
Nicole Thomas
567c363e5c
Merge pull request #44989 from vutny/oxygen-doc-schedule-util-duplicated 
[Oxygen] [DOC] Add doc page reference for schedule util module
 2017-12-15 14:49:48 -05:00
Nicole Thomas
653ad2a224
Merge pull request #44946 from terminalmage/unicode-file 
[PY3] Update file state/execution modules and associated files with unicode_literals
 2017-12-14 16:26:50 -05:00
rallytime
3e319d50b3
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - README.rst
  - salt/modules/win_pkg.py
  - salt/utils/process.py
 2017-12-14 13:01:29 -05:00
Denys Havrysh
da5e580f8c
[DOC] Add doc page reference for schedule util module 2017-12-14 16:53:07 +02:00
Erik Johnson
c3332c857f
Clarify jinja filter documentation 2017-12-13 16:43:45 -06:00
Erik Johnson
1bfc53fc57
Update file state/execution modules and associated files with unicode_literals 
This updates the file state and execution modules to use
unicode_literals. Since the serializers and the cmd module are touched
by the file state/exec module, those are also updated here, as well as
the cmd state module, for good measure.

Additionally, I found that salt.utils.data.decode_dict (and decode_list)
are misnamed for what they actually do. Since they *encode* the
contents, the functions should be named encode_dict and encode_list,
respectively. And we also should have counterparts which actually
decode, so I've added them. The compatibility functions from salt.utils
still use the old "decode" names to preserve backward compatibility, but
they now invoke the renamed "encode" functions in salt.utils.data. Note
that this means that the compatibility functions
salt.utils.decode_dict/list, and their cognates in salt.utils.data now
do different things, but since the move to salt.utils.data is also
happening in the Oxygen release this is as good a time as any to correct
this oversight.

I've updated the jinja filter docs to include information on the renamed
jinja filters, and also added a section on jinja filter renaming to the
Oxygen release notes. There was another filter that I renamed during the
process of moving functions from salt.utils which I did not properly
document in the release notes, so this is now included along with the
others.
 2017-12-13 16:43:45 -06:00
Nicole Thomas
1c22cb04e6
Merge pull request #44634 from anitakrueger/fix-cassandra-cql-versions 
Adding version 3 queries for Cassandra keyspaces and columns functions
 2017-12-13 09:33:23 -05:00
Nicole Thomas
990c6284b2
Merge pull request #44678 from isbm/isbm-master-autodiscovery 
Master/Minion auto-discovery
 2017-12-12 18:42:09 -05:00
Anita Krueger
8540a6b017
Adding documentation for new Cassandra v3 support 2017-12-12 20:51:22 +00:00
mvivaldi
d23ac4eabc Fix for the jinja documentation 2017-12-12 17:35:46 +01:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/thorium/index.rst
  - salt/beacons/__init__.py
  - salt/client/mixins.py
  - salt/client/ssh/wrapper/state.py
  - salt/daemons/masterapi.py
  - salt/grains/extra.py
  - salt/minion.py
  - salt/modules/cron.py
  - salt/modules/file.py
  - salt/modules/mac_user.py
  - salt/modules/napalm_network.py
  - salt/modules/state.py
  - salt/modules/win_file.py
  - salt/modules/win_pkg.py
  - salt/proxy/dummy.py
  - salt/state.py
  - salt/states/file.py
  - salt/states/lxc.py
  - salt/utils/__init__.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_file.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/daemons/test_masterapi.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_disk.py
  - tests/unit/modules/test_napalm_network.py
  - tests/unit/modules/test_state.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_process.py
 2017-12-11 18:24:41 -05:00
Bo Maryniuk
e803d1aa66 Fix documentation 2017-12-11 17:43:20 +01:00
Bo Maryniuk
7fb357d202 Update documentation about Minion/Master relation 2017-12-11 17:43:19 +01:00
Bo Maryniuk
f5cf2419cc Add initial documentation for current basic autodiscovery implementation 2017-12-11 17:43:19 +01:00
Daniel Wallace
9e5d6c03f8
Merge branch 'develop' into shade 2017-12-11 08:53:13 -07:00
mvivaldi
62409d608a Added Escape Filters and Set Theory Filters in jinja documentation 2017-12-09 09:48:55 +01:00
Nicole Thomas
95d9eb5744
Merge pull request #44324 from benediktwerner/accept-minions-from-grains 
Automatically accept minion keys based on grains
 2017-12-08 09:02:01 -05:00
Erik Johnson
b78e373213
Grammar/spelling fixes in release notes 2017-12-06 14:38:35 -06:00
Erik Johnson
457aa8505c
Update release notes for new "docker run" functionality 2017-12-06 12:12:26 -06:00
Erik Johnson
64aa4fbbec
Many improvements to docker network and container states 
Much Improved Support for Docker Networking
===========================================

The `docker_network.present` state has undergone a full rewrite, which
includes the following improvements:

Full API Support for Network Management
---------------------------------------

The improvements made to input handling in the
`docker_container.running` state for 2017.7.0 have now been expanded to
docker_network.present`.  This brings with it full support for all
tunable configuration arguments.

Custom Subnets
--------------

Custom subnets can now be configured. Both IPv4 and mixed IPv4/IPv6
networks are supported.

Network Configuration in :py:func:`docker_container.running` States
-------------------------------------------------------------------

It is now possible to configure static IPv4/IPv6 addresses, as well as
links and labels.

Improved Handling of Images from Custom Registries
==================================================

Rather than attempting to parse the tag from the passed image name, Salt
will now resolve that tag down to an image ID and use that ID instead.

Due to this change, there are some backward-incompatible changes to
image management. See below for a full list of these changes.

Backward-incompatible Changes to Docker Image Management
--------------------------------------------------------

Passing image names to the following functions must now be done using separate
`repository` and `tag` arguments:

- `docker.build`
- `docker.commit`
- `docker.import`
- `docker.load`
- `docker.tag`
- `docker.sls_build`

Additionally, the `tag` argument must now be explicitly passed to the
`docker_image.present` state, unless the image is being pulled from a
docker registry.
 2017-12-06 12:12:25 -06:00
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
f7d182871e
remove openstack driver 2017-12-05 16:09:30 -07: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
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
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
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
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
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
Mircea Ulinic
101e8f0837
Mention the new opts in the Oxygen release notes 2017-11-22 12:50:04 +00:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains 2017-11-17 19:35:53 +01:00
Mircea Ulinic
0320174ea4
Add doc note regarding static grains on proxy minions 2017-11-15 13:19:03 +00: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
Thomas Phipps
d148e39dda
change from md to rst for code reference 2017-11-13 15:15:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout 2017-11-13 11:49:30 -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
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
Gareth J. Greenaway
a8e495f18f
Updating documentation and release notes. 2017-11-08 16:06:44 -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
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
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
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
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
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +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
Vernon Cole
b7c0182d93
correct and clarify documentation 2017-10-20 09:24:26 -06: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
Mike Place
73c3581864 Merge pull request #44037 from vernondcole/vagrant-cloud 
Vagrant cloud and state modules
 2017-10-17 14:36:38 -06:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04: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
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
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
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
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
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
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
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
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
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
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation 
s/scalewa/scaleway
 2017-10-04 23:23:00 +00: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
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
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
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
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
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
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
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
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
Mike Place
1a619708c1 Enhance engines docs 
Add a note about formatting to make it more clear.
 2017-09-18 13:44:44 -06: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
Mike Place
15ffecd4a7 Give the name of the roster 2017-09-12 15:44:26 -06:00
Mike Place
eba40686e8 Add information about cimc to release notes 2017-09-12 14:39:00 -06:00
Mike Place
27315c31c8 Add release note about ssh rosters 2017-09-12 10:41:06 -06:00
Olivier Mauras
139e065ce9 New pillar/master_tops saltclass module 2017-09-12 15:53:39 +02:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
 2017-09-11 12:55:39 -04:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
rallytime
68f529ee5e Add 2016.11.8 release notes 2017-09-11 10:58:16 -04:00
Nicole Thomas
d97a680372 Merge pull request #43333 from damon-atkins/2016.11 
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
 2017-09-06 10:21:34 -04:00
rallytime
7b07b58396 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/key.py
  - salt/modules/yumpkg.py
 2017-09-06 09:44:34 -04:00
Damon Atkins
92de2bb498 Update doco 2017-09-06 12:31:51 +10:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env 
Remove deprecation warnings for "env"
 2017-09-05 18:24:54 -04:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment'] 
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
 2017-09-05 19:52:42 +00:00
Nicole Thomas
a972c4fb8c Merge pull request #42840 from StreetHawkInc/update_azurearm 
Update salt-cloud azurearm to work with latest sdk
 2017-08-30 12:01:34 -04:00
rallytime
0d5a46dbaa Update release branch section with a few more details 2017-08-29 09:38:11 -04:00
rallytime
375b1faa92 Remove deprecation warnings for "env" 
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
 2017-08-28 10:37:05 -04:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -04:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
Ch3LL
1b24244bd3 Add New Release Branch Strategy to Contribution Docs 2017-08-24 12:51:00 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Mike Place
449c4c53c3 Add release note for nacl renderer 
Refs #41868
 2017-08-22 13:38:21 -06:00
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth 
Allow `external_auth` limit funs/args for runner/wheel modules.
 2017-08-22 14:19:06 -04:00
Steven
e025b0cc92 Merge branch 'develop' into update_azurearm 2017-08-23 00:22:33 +10:00
Steven Joseph
30bde1d7f3 Updated as per PR comments, 
- add version checking
- add doco
 2017-08-23 00:21:03 +10:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Dmitry Kuzmenko
7ec398eb72 Allow external_auth limit funs/args for runner/wheel modules. 
Example:
external_auth:
  pam:
    thatch:
      - '@runner':
        - 'mod.fun':
          args: ['a', 'b']
          kwargs:
            aa: bb
 2017-08-22 12:17:09 +03:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
Nicole Thomas
c35706fa3f Merge pull request #43011 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-17 16:19:33 -04:00