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
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -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
73282d51cc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cli/daemons.py
salt/master.py
salt/minion.py
salt/modules/gpg.py
salt/modules/pw_group.py
salt/utils/http.py
setup.py
tests/unit/modules/schedule_test.py
2015-08-19 11:29:45 -06:00
C. R. Oldham
2de9672e95
Doc updates
2015-08-14 11:52:19 -06:00
Colton Myers
d8c5dfb33f
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-07-30 16:58:19 -06:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Petr Demin
a80c47ee10
Fixed typo in salt.states.saltmod.function doc string
2015-07-30 09:27:14 -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
c33eb813ea
Change docs for --static option with JSON - text B
2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb
Change docs for --static option with JSON - text A
2015-07-27 09:00:59 -06: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
0a46dc4c40
Built man page for spm, added man page entry for spm to doc/conf.py
...
Refs #25213
2015-07-07 20:48:58 -06:00
Jacob Hammons
98d7867957
Built man page for spm, added man page entry for spm to doc/conf.py
...
Refs #25213
2015-07-07 16:54:26 -06:00
Jacob Hammons
cf97a4ab17
Updated man pages
2015-06-26 12:21:26 -06: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
befb666623
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/mongodb.py
salt/utils/http.py
salt/utils/process.py
tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Jonathan Ballet
19efd419b5
Improve state_output documentation
...
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02: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
Colton Myers
66378be75e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/states/requisites.rst
salt/master.py
salt/modules/win_pkg.py
2015-04-16 12:27:53 -06:00
Colton Myers
ccfcedbf6b
Go back to the 2015.2 version of salt.7
2015-04-16 11:46:30 -06:00
Colton Myers
8d9874a78a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-16 10:37:38 -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
Jacob Hammons
6e416fc300
Regenerated salt-call and salt.7 man pages Refs #22239
2015-04-14 13:56:31 -06: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
