rallytime
7bf9f5d0f5
Merge branch '2016.3' into 'develop'
...
Conflicts:
- doc/man/salt.7
- doc/ref/executors/all/salt.executors.direct_call.rst
- doc/ref/executors/all/salt.executors.splay.rst
- doc/ref/executors/all/salt.executors.sudo.rst
- salt/cloud/clouds/vultrpy.py
2016-05-18 09:40:48 -06:00
jacobhammons
7e95127467
man pages updated ( #33307 )
...
sphinx build fixes
doc additions for new modules including thorium
2016-05-17 10:24:44 -06:00
rallytime
2ee175c6d3
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/fileclient.py
- salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
rallytime
031a75ca33
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- Contributing.rst
- conf/master
- doc/index.rst
- doc/man/salt.7
- pkg/suse/README.suse
- salt/client/ssh/state.py
- salt/minion.py
- salt/modules/zypper.py
- salt/utils/schedule.py
- tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d
Remove trailing white spaces in documentation files
2016-03-01 17:36:23 +02:00
Kris Raney
afa297e4d1
Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first
2016-02-25 10:17:39 -06:00
Zach Malone
271c44667d
Fixing typos, many examples in here still don't work (ex. salt -t 15 '*' gpg.create_key throws errors), but some low hanging fruit is fixed.
2016-02-09 15:44:51 -07:00
Justin Findlay
543f0ca712
doc, conf, pkg: VMWare -> VMware
2016-02-03 14:27:28 -07:00
Jacob Hammons
fca119fe80
Updated man pages, version to 2015.8.4, added CVE 2016-1866 to release notes
2016-02-02 13:04:34 -07:00
Daniel Wendler
e38f1fba3f
Renaming salt-ssh option and documentation fix
...
For consistency the wipe_ssh option is renamed in ssh_wipe as all other
options in the salt-ssh command are in this style.
The documentation was also adjusted to reflect the renaming.
There were also an wrong salt-ssh example in the documentation.
2016-01-26 08:36:13 +01:00
Jacob Ward
40d9e6f505
Fixes #30569
2016-01-23 16:47:40 -07:00
Jacob Hammons
891ddafcba
Updated man pages for 2015.8.4, updated copyright to 2016
2016-01-14 16:17:27 -07:00
Akhter Ali
abe16e0b9f
Fixing typo
2015-12-09 16:48:14 -05:00
rallytime
cded9ac01d
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
2015-11-06 09:34:31 -07:00
Daniel Hahler
eaf27d6ee7
doc: fix typo with salt.states.file: s/preseve/preserve/
2015-11-04 23:29:37 +01:00
Dmitry Kuzmenko
7a5204ef02
Deprecate client_acl with publisher_acl (rename)
...
Keeping client_acl support
2015-10-23 11:59:40 +03:00
Thayne Harbaugh
7f8d5a56d1
Improve documentation of check_cmd
.
...
* Make the distinction between requisite `check_cmd` and `file.managed`
`check_cmd`.
* Be more clear about `file.managed` `check_cmd`, the temporary file,
and when the new contents are written or discarded.
* In requisite `check_cmd` use a concise `!` rather than the awkward
`&& exit 1 || exit 0`.
* A few minor, stylistic changes.
2015-10-20 13:44:06 -06:00
Jacob Hammons
cc37dc1087
updated version in salt.7
2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13
regenerated man pages for 2015.8.1
2015-09-30 12:58:34 -06:00
Justin Findlay
8ea15f498e
2015.2,2015.8,Beryllium -> 2015.8.0
...
Some features were erroneously reported as being added in 2015.2.
2015-09-18 16:35:15 -06:00
Jacob Hammons
701f47a658
Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py
...
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
2015-09-01 17:09:35 -06:00
Colton Myers
d8c5dfb33f
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-07-30 16:58:19 -06:00
Jacob Hammons
0e02191f61
regenerated man pages
2015-07-29 10:24:47 -06:00
Petr Demin
404f22f09f
Fixed typo in salt.states.saltmod.function doc string
2015-07-29 16:48:44 +03:00
Alexey Pakseykin
454b7b5815
Change docs for --static option with JSON - text B
2015-07-25 23:39:50 +08:00
Alexey Pakseykin
39d45ec691
Change docs for --static option with JSON - text A
2015-07-25 23:37:49 +08:00
Ben Brady
a6bbfbfe8e
return will not work in the context it is being used in - docs are misleading
2015-07-14 14:13:03 -07:00
Jacob Hammons
30a907576c
rebuilt man pages, versioned html theme css
2015-06-26 11:06:21 -06:00
Julien Barbot
6d7e779e62
Fix typo in salt-cloud reactor section
2015-06-24 16:40:32 +02:00
Aneesh Agrawal
82a4794e0f
Do not reference serializers from aggregation docs.
2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c
Add new module type for serializers from issue #22257 .
...
Move existing serializers from salt.utils.serializers to
salt.serializers.
2015-05-28 20:03:11 -04:00
Paul Theodoropoulos
f7f002daf5
Removed link to github page that no longer exists.
2015-05-13 17:27:44 -07:00
Markus "Shorty" Uckelmann
61eab1e156
How to still use existing $PATH in "cmd" modules
...
Enhances #21840
Added a code example on how to still use the existing $PATH environment
variables in cmd modules. The code was taken from a mail from Ethan
Erchinger to the salt-users list.
2015-05-12 12:00:03 +02:00
Colton Myers
ece63c36a3
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/ssh/roster.rst
salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Erik Johnson
d6b62f73a4
Update manpages to reflect 2015.2 rename to 2015.5
2015-05-06 11:13:13 -06:00
Erik Johnson
0504e7a184
Update Lithium docstrings in 2015.2 branch
2015-05-06 11:01:53 -06:00
Vladimir Pouzanov
921aaea9b4
Fixed a Runenr typo in the docs
2015-05-03 18:47:15 +01:00
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Jacob Hammons
99abfd7755
Regenerated man pages
2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397
Revert "Regenerated man pages"
...
This reverts commit 069a0cac71
.
2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71
Regenerated man pages
2015-04-21 11:20:52 -06:00
Markus "Shorty" Uckelmann
1341784184
improve cmd.run env documentation
...
Resolves #21840
Improved documentation to cmd.run(et.al.) env argument by mentioning
that variables as values will not be evaluated.
2015-04-16 11:20:20 +02:00
Luca Corti
3aa4b3bfe6
Add recursive database owner change to postgres module/state
...
Add recursive owner change to postgres.db_alter and expose it via
postgres_database.present parameter.
`owner_recurse` defaults to false to avoid breaking compatibility, but
could arguably be a sane default.
2015-04-05 09:31:53 +02:00
Colton Myers
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/index.rst
doc/topics/eauth/index.rst
salt/beacons/__init__.py
salt/beacons/service.py
salt/loader.py
salt/minion.py
salt/output/nested.py
2015-03-30 15:10:17 -06:00
Jacob Hammons
7cb6c8fdcb
Updated salt man page
2015-03-27 12:15:49 -06:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Jacob Hammons
767a3c378d
Updated man pages, updated copyright year in conf.py
2015-03-09 18:36:38 -06:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
Todd Wells
99114eeeeb
cloud timeout doc updates
2015-01-16 12:37:28 -08:00
Justin Findlay
ad33589fac
move requirements files into requirements dir
2014-12-27 17:29:03 -07:00