valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,972 Commits 24 Branches 182 Tags 341 MiB
ab0a6a38e5
Commit Graph

89 Commits

Author SHA1 Message Date
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Michael Brown
9b39eae40c alternative way of restarting windows minion 2014-12-01 16:51:58 -05:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Seth House
daf0fe9937 Added nohup example to the FAQ about restarting Salt with Salt 
Suggested by @ in #7997.
 2014-11-14 12:40:18 -05:00
Thomas S Hatch
bc7217c331 Add comment to clarify confusion in faqs 2014-11-03 20:24:44 -07:00
Erik Johnson
d9e036630a Fix weird merge forward in FAQ 2014-10-22 10:26:48 -05:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Erik Johnson
6ac209e6a7 Add example states for installing at and running atd 2014-10-08 16:50:47 -05:00
Thomas S Hatch
999d695d8f Merge branch '2014.7' into develop 
Conflicts:
	salt/output/key.py
 2014-09-26 14:54:00 -06:00
Erik Johnson
1a88ebf1f8 Update docs reference to Halite 
Halite is no longer "new", and shouldn't be referred to as such.
 2014-09-25 23:54:59 -05:00
Erik Johnson
aae0b3dcef Clarify salt-minion restart example in FAQ 2014-08-29 12:17:06 -05:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
rallytime
76340a5c62 Documentation for salting the salt master 2014-05-23 13:50:08 -06:00
Seth House
04057b27dc Added an example to the FAQ for how to restart Salt with Salt 
Closes #12243
 2014-04-30 13:55:58 -06:00
Colton Myers
6238abff5b Add more version compatibility information to the FAQ, Fix #10934 2014-03-05 10:35:29 -07:00
David Lindquist
9c91539de7 Replace mentions of 0.18.0 with 2014.1.0 2014-02-14 17:01:57 -08: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
Erik Johnson
3fb755b63c Add example about jobs.list_jobs, jobs.lookup_jid 
Sometimes the salt CLI will exit without displaying the return data from
all minions, but they do actually return data. This commit explains how
to use the jobs runners to obtain job return data and potentially catch
minions that did not return in these edge cases.
 2014-01-25 20:56:01 -06:00
Forrest Alvarez
52e6d273f6 updated the faq to add a note about backup_mode, fixed a typo in the backup mode docs, and updated one of the file.managed examples with a backup line, as well as an additional note directing the user to the backup mode documentation in a highly visible area. 2013-12-08 05:52:45 +00:00
Colton Myers
6f4372e5b6 Add FAQ about SELinux, Fix #8545 2013-11-15 15:13:05 -07:00
Forrest Alvarez
1b9849049a updated to faq file to reword backwards compatibility 2013-11-14 05:38:28 +00:00
Forrest Alvarez
139e3b3bb9 updated FAQ. 2013-11-14 04:49:54 +00:00
Thomas S Hatch
dfc90634a1 no longer future tense 2013-10-25 09:02:43 -06:00
Chris Rebert
1fe7df8650 faq.rst: fix typo 2013-09-23 11:59:37 -07:00
Erik Johnson
e685ebe23f Fix typo 2013-09-23 09:55:56 -05:00
Erik Johnson
8233587cea Add note on pkg/service states not working to FAQ 
Also fixed a typo in an RST directive.
 2013-09-22 21:32:16 -05:00
Thomas S Hatch
2e3092528e Merge branch 'develop' of git://github.com/ktenney/salt into ktenney-develop 
Conflicts:
	doc/faq.rst
 2013-09-20 13:39:53 -06:00
Kent Tenney
ab7fd7041c added -Contents-, removed inline markup from section headings 2013-09-19 20:44:55 -05:00
Joe Healy
21fce7eaa1 Minor faq fix (do -> don't) 2013-09-20 10:38:40 +10:00
Erik Johnson
9e32266b24 Add note on test.ping to FAQ 
This is a common question in #salt.
 2013-09-16 13:05:35 -05:00
Erik Johnson
3d3c2fefb8 Add note regarding PATH issues to FAQ 2013-09-10 15:59:10 -05:00
Erik Johnson
338e4b0cf1 Typo fixes and further FAQ tweaks 2013-09-09 15:57:38 -05:00
Erik Johnson
10d671d9da Fix broken link in FAQ 
The link to "state.hightstate" in the 3rd bullet point was not properly
formed, so the hyperlink failed to create.

Also massaged the paragraphs explaining the difference between the
cmd.run and cmd.wait states.
 2013-09-09 12:14:21 -05:00
Erik Johnson
ccc6a99747 Link directly to id param docs 2013-09-09 11:10:58 -05:00
Joe Healy
2af9e92515 Tweaks to faq with aim of aiding beginners 2013-09-10 00:15:49 +10:00
Erik Johnson
01f27df7ac add missing period 2013-09-05 13:59:48 -05:00
Erik Johnson
dd30dfeac4 Fix sphinx build warning and move FAQ to root 
This fixes a warning from new pages not being in a toctree, as well as
moves the new FAQ page from the /ref dir to the root.
 2013-09-05 13:46:32 -05:00