valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,958 Commits 24 Branches 182 Tags 341 MiB
fc756c595c
Commit Graph

223 Commits

Author SHA1 Message Date
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
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Jacob Hammons
921d679065 Regenerated and updated man pages, updated release version in conf.py to 2014.7.2 2015-03-10 09:22:57 -06: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
Metin OSMAN
21a6f6f0e7 Add the ability to filter the map file with salt-cloud 2014-12-11 01:39:54 +01:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
Stephen Wood
1be08146c8 Fix minor typos. 2014-10-11 17:03:38 -07:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/pip_state.py
 2014-09-15 11:49:04 -06:00
Seth House
978931c470 Added salt-unity manpages 
Closes #13937
 2014-09-13 12:56:25 -06:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop 
Conflicts:
	conf/minion
	salt/modules/mine.py
 2014-09-02 10:43:31 -06:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Joseph Hall
e90b55650e Merge pull request #15020 from Jille/typos 
Fix two typos in docs
 2014-08-15 08:21:13 -06:00
Sylvain Bellemare
9f6ecc4874 Removed duplicate occurrences of the word "the" 2014-08-11 16:05:29 +02:00
Jille Timmermans
1618c8d257 Fix typo in manpage: s/inetrfaces/interfaces/ 2014-08-11 15:42:03 +02:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Bertrand Janin
3cc6fb4fe7 Fix copy-pasta error in user_update example. 2014-07-18 08:32:40 -04:00
Thomas S Hatch
1577bf0fad Merge pull request #14178 from khrisrichardson/spelling 
add sphinx spelling extension. enforce en_US
 2014-07-14 15:43:33 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Volker Schwicking
92ff66b2e5 add signature-path to manpage 2014-07-10 11:33:39 +02:00
vs
11e25ed9d1 add documentation for salt-keys signature generation options to manpage 2014-07-10 02:16:22 -07:00
Thomas S Hatch
1cd95aa0c8 Revert "Sign the masters pub-key" 2014-06-30 15:04:53 -06:00
vs
f54b90b07c pylinting, better log messages, docstrings, no logic changes 2014-06-25 06:26:01 -07:00
Pedro Algarvio
1f0e0d4465 Remove doc/man/salt-api.7 2014-06-21 19:00:55 +01:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Arnold Bechtoldt
04a0133945 updating homebrew installation URL 2014-05-19 20:27:43 +02:00
David Lindquist
1937eb85af Update all raw.github.com references to raw.githubusercontent.com 
Per
https://developer.github.com/changes/2014-04-25-user-content-security/
raw.github.com is now served from raw.githubusercontent.com.
 2014-04-29 14:29:34 -07:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http" 
This reverts commit 6fc260be9e.
 2014-04-27 11:46:36 +01:00
Daniel Wallace
6fc260be9e Default to https instead of http 
For everything that doesn't use python urllib
 2014-04-26 20:20:32 -05:00
Seth House
dbc41bf5b5 Updated manpages for 0.8.4 2014-04-05 01:51:16 -06:00
viod
f6bd8415b3 Add the indication that pillar_roots should not be subdirectories of file_roots, as that won't work, everywhere it looks relevant. 2014-03-03 00:15:51 +01:00
Jens Rantil
302629bc72 Fix typo: maintinance => maintenance 2014-02-27 14:59:24 +01:00
David Lindquist
9c91539de7 Replace mentions of 0.18.0 with 2014.1.0 2014-02-14 17:01:57 -08:00
Daniel Wallace
7042099c14 [salt.cloud] missing a : in documentation 2014-02-08 22:05:14 -06:00
regilero
93f8cdc0f0 Doc: fix bad usage of requisite in man salt 2014-02-04 10:47:34 +01:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi 
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
 2014-01-26 18:41:28 -08:00
Bruno Binet
c374214d4d Fix documentation related to docker port_bindings 2014-01-04 11:30:58 +01:00
Thomas S Hatch
1ef832d093 update man pages to 2014.1.0 2014-01-02 12:59:16 -07:00
Sylvestre Ledru
0d5afed1a8 Debian is not necessary a Linux. It can also be a Freebsd or HURD based 2013-11-19 17:23:56 +01:00
Jeffrey C. Ollie
b1fb52a680 fix more funcion => function typos 2013-11-15 14:50:17 -06:00
Pedro Algarvio
5feb449584 Add the missing salt-cloud man page. 2013-11-10 13:28:19 +00:00
Seth House
e3cf6bc5c2 Updated the manpages for 0.8.3 2013-10-29 01:09:52 -06:00
Wari Wahab
d2094f8b60 Fixed all typos I can find 2013-10-25 16:26:57 +08:00
Elias Probst
e483404260 Corrected typos. 2013-10-22 19:38:31 +02:00
Mike Place
0593c3311d A minor clarity fix for documentation regarding the extension of Salt. 
I attempted to preserve what I believe to be the original intent of the author but please feel free not to merge these changes if you feel that I've failed in doing so. :]
 2013-10-03 14:51:49 -06:00
Mike Place
af376a7706 The documentation for state ordering contained duplicate information about 0.17 in two contiguous paragraphs. Removed the first of those occurrences to improve readability. 2013-10-02 15:19:41 -06:00
Thomas S Hatch
b5e4e15c8a Update manpages with correct version number 2013-09-18 23:58:58 -06:00
Seth House
15ec371f26 Built the manpages for 0.17 2013-09-17 17:58:01 -06:00
Ethan Erchinger
5f5693b4ff document new prefix flag 2013-08-10 09:15:08 -07:00
Colton Myers
191f6d1843 Revert "Merge pull request #6573 from erchn/develop" 
This reverts commit 3e1df4f901, reversing
changes made to 9f2018fff4.
 2013-08-08 17:04:07 -06:00
Ethan Erchinger
0bef33db0c update man page and docstring in fileclient 2013-08-08 09:47:45 -07:00
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect 
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
 2013-07-27 16:51:38 -04:00
Sebastian Vetter
229a4e9d2d Update ext_pillar location in manpage 2013-06-30 23:53:21 +10:00
Thomas S Hatch
67f0b88225 Bump man pages to 0.15.90 2013-06-21 15:18:17 -06:00
Tim Laszlo
89b6a07267 Replace human_name with humanname. 
The documentation indicates
human_name should hold to a human readble name for the repository.
The code is looking for humanname.
 2013-05-20 13:14:17 -05:00
Thomas S Hatch
ae5e55811e Update man pages to 0.15.0 2013-05-03 14:48:49 -06:00
Thomas S Hatch
73a954b6a2 Merge pull request #4289 from grischa/postgres_default_db 
renamed postgres.db to postgres.maintenance_db, runas postgres on localhost only
 2013-04-01 10:12:09 -07:00
David Lindquist
009d2354fe Fix typo: s/mimion/minion/ 2013-03-31 12:27:09 -07:00
Grischa Meyer
54f7055a38 renamed postgres.db to postgres.maintenance_db and all postgres module function arguments from db to maintenance_db 
made default maintenance_db "postgres" and also made default postgres/psql runas local-server only
 2013-03-27 11:03:56 +11:00
Cory Wright
9aed1fe9cf add a mention of the include_empty option to file.recurse 2013-03-22 14:17:08 -04:00
pengyao
0176cde512 modify content error, "vm.swappines" to "vm.swappiness" 2013-03-17 10:45:15 +08:00