valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
52,233 Commits 24 Branches 182 Tags 341 MiB
3dea1e98a1
Commit Graph

488 Commits

Author SHA1 Message Date
Thomas S Hatch
dca509eb0d Merge pull request #19859 from twellspring/develop 
Documentation fix for Issue 19513.
 2015-01-20 16:06:03 -07:00
Colton Myers
88fb2e0036 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/tutorials/starting_states.rst
	salt/modules/linux_lvm.py
 2015-01-20 15:19:53 -07:00
Colton Myers
1fb6fc0ba1 Fix the explanation of the Default Data - YAML section of starting states 2015-01-20 15:03:54 -07:00
twellspring
cb2bfd6921 Update states_pt1.rst 2015-01-19 20:46:03 -08:00
twellspring
b78dff7011 Update starting_states.rst 2015-01-19 20:19:23 -08:00
Mike Place
0ac3e624af Remove a documentation surprise 2015-01-14 15:28:40 -07:00
Pedro Algarvio
1ce6910467 Some fixes to #19161 2015-01-07 20:58:40 +00:00
James Michael DuPont
e6e7ab6cbc rooted config 
* updated documentation
* troubleshooting
* Itegrated comments and feedback
* bugfixes to format and language
* linting the changes
 2015-01-01 07:07:09 -06:00
Matthias Sieber
d8af90c611 update States Tutorial part 2 
Explanation of yaml file with matching line numbers
 2014-12-23 16:20:42 -08:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
 2014-12-23 10:57:26 -07:00
Seth House
a8e8111c92 Add a cross-ref to the vmbuilder formula repo 2014-12-19 14:34:58 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
rallytime
926c486587 Correct master_sign_key_name reference 
Fixes #19053
 2014-12-17 11:32:23 -07:00
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
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop 
More grammar/style cleanup
 2014-12-12 09:40:55 -07:00
Steve Groesz
6cb313533b Fix missing text 
Found missing colon, causing code blocks not to display.  This fixes issue #18879
 2014-12-11 17:29:31 -06:00
Thomas Jackson
c18e834be1 Fix trailing whitespace 
Conflicts:
	doc/topics/tutorials/states_pt2.rst
 2014-12-11 07:53:19 -08:00
Fabian Affolter
d5caef6666 add section about fedora 18+ and rhel/centos 7 2014-11-24 23:56:28 +01:00
Thomas S Hatch
9860f189d4 Merge pull request #18247 from terminalmage/docs 
Add note about libssh2 optdepend for ssh access w/libgit2
 2014-11-19 09:40:52 -07:00
Erik Johnson
d2b3da6bd7 Add note about libssh2 optdepend for ssh access w/libgit2 
See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
 2014-11-18 22:08:29 -06:00
Colton Myers
c505a2d3ff Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/at.py
	salt/modules/makeconf.py
	salt/modules/pacman.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
 2014-11-18 16:48:47 -07:00
Colton Myers
426c97282e Deprecating for Boron, not Beryllium 2014-11-18 16:39:01 -07:00
Colton Myers
c0f7756153 Reorganize orchestration doc and deprecate overstate runner 2014-11-18 16:31:36 -07:00
Nitin Madhok
71d964bccf Removing non existing document 2014-11-18 03:10:59 -05:00
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward 
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
 2014-10-30 17:42:36 -06:00
Thomas Jackson
9f7dac0674 Spelling fixes for docs 2014-10-28 08:12:27 -07:00
Chris Rebert
d37690e156 fix typos: retreived [sic] 2014-10-27 16:13:46 -07:00
Mike Place
3767666ccb Note the presence of master_alive_interval in MM docs. 
Refs #14906
 2014-10-23 11:47:00 -06:00
Martyn Smith
a899af7418 Fix example command to one that exists 
Fix walkthrough to use disk.usage instead of disk.percent (which doesn't appear to exist any more).
 2014-10-21 09:51:54 +13:00
Thomas S Hatch
3cf0cfb61d Merge branch '2014.7' into develop 2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Erik Johnson
90ba9b8a43 Add notice that per-remote auth params are not supported in GitPython 2014-10-18 17:36:51 -05:00
Erik Johnson
00bd8477dd Fix sphinx build error 
There is no 'math' lexer in sphinx.
 2014-10-15 22:43:37 -05:00
Tim O'Guin
156768408a updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master 2014-10-04 14:57:06 -05:00
Tim O'Guin
41978cc449 updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master 2014-10-03 01:35:28 -04:00
Thomas S Hatch
3e204c16f3 Merge branch '2014.7' into develop 2014-09-29 20:07:01 -06:00
Thomas S Hatch
ea5c8518db Merge pull request #16246 from rallytime/pillar_docs 
Add note on how to set pillar data on the command line to pillar tutorial
 2014-09-29 20:03:47 -06:00
Ed Kern
3933cdb72a pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 16:21:08 -06:00
rallytime
38db7b7d5e Add note on how to set pillar data on the command line to pillar tutorial 
Closes #14217
 2014-09-29 16:04:30 -06:00
Ed Kern
93b0c1f80e pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 12:27:08 -07:00
Nitin Madhok
b7f43d34f8 Update instances of install_salt.sh.sh 2014-09-24 12:16:48 -04:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
Erik Johnson
36d59944d1 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
c094f8bd68 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
604a131f6f Fix sphinx build error 2014-09-17 18:00:18 -05:00
Hung Nguyen Viet
d47b8be40f remove duplicate entry, it was in advanced topics 2014-09-16 14:16:17 +07:00
Nitin Madhok
b7d5b2cde2 Fixing sphinx violations and errors 2014-09-12 13:28:01 -04:00
Thomas S Hatch
d6e3e01c6d Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules 
F/add syslog ng modules
 2014-09-12 10:37:02 -06:00
Thomas S Hatch
e34e81f41b Merge branch '2014.7' into develop 
Conflicts:
	salt/minion.py
 2014-09-05 11:03:12 -06:00
rallytime
e5a1876462 Update multimaster tutorial 2014-09-04 12:58:19 -06:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00
Erik Johnson
3c800cdd5f Add pygit2 install link to gitfs walkthrough 2014-09-02 23:33:11 -05:00
Colton Myers
4214f8dc2b Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/network.py
 2014-09-02 16:35:03 -06:00
Erik Johnson
510942d3ec Remove references to masterless salt from gitfs docs 
Alternate backends do not yet work with the local fileclient.
 2014-09-02 15:59:05 -05:00
Erik Johnson
9b2fc52e93 Fix duplicate word 2014-09-02 15:31:13 -05:00
Erik Johnson
ac944272e0 Fix spelling error 2014-09-02 15:27:44 -05:00
Mike Place
8c737afa1e Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-09-02 14:20:04 -06:00
Erik Johnson
ba3e0367c6 Remove extraneous word 2014-09-02 15:16:32 -05:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Erik Johnson
0a5bc21b58 More gitfs documentation clarifications/corrections 2014-09-02 14:37:52 -05:00
Erik Johnson
0ae4a108b7 Clarify outdated information in gitfs walkthrough 
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
 2014-09-02 13:22:56 -05:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Simon Schmidt
f4c9ec24de Fix saltutil.refresh_pillar reference in Pillar tutorial 
It used to reference `saltutil.pillar_refresh` which gives the error:

    'saltutil.pillar_refresh' is not available.
 2014-09-01 20:38:50 +02:00
Joseph Hall
4e29954710 Update Esky docs for clarity, and remove 2nd person 2014-08-30 19:50:32 -06:00
btibi
69b0deacf6 syslog_ng: add syslog-ng state and execution modules 2014-08-29 23:20:25 +02:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
 2014-08-25 13:29:29 -06:00
Joseph Hall
0b546aeadd Merge pull request #15234 from cachedout/pillar_refresh_doc 
Add info about pillar refresh.
 2014-08-25 11:12:54 -06:00
Erik Johnson
41a0753518 Add ssh_config example for GitPython 2014-08-25 12:06:29 -05:00
Mike Place
0d03e31fb7 Add info about pillar refresh. 2014-08-25 10:56:55 -06:00
Chris Rebert
a53ae15d23 copyedits 2014-08-22 11:59:13 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Erik Johnson
5444c68437 Update docs to reflect pygit2 auth support in 0.20.3 2014-08-20 23:54:48 -05:00
Erik Johnson
c8be676577 Update gitfs documentation 
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
 2014-08-20 21:36:44 -05:00
Joseph Hall
725f2d8969 Typo correction 2014-08-14 14:31:25 -06:00
Joseph Hall
130755c0b1 Adding http libraries and modules 2014-08-14 13:33:12 -06:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Nitin Madhok
41712eab04 Fixing more sphinx warnings and errors 2014-08-11 12:33:55 -04:00
Thomas S Hatch
996bae04cd Add clarity note in the docs 2014-08-07 12:08:14 -06:00
Alfredo Palhares
145670b459 Add missing lines between the code block declaration and the body 2014-08-05 00:40:18 +01:00
Seth House
ab508cb9d3 Fix maxdepth TOC for Salt at Scale tutorials 2014-08-01 12:05:22 -06:00
Hung Nguyen Viet
415623a9c6 fix link scheme, default scheme is HTTPS, as used sample configs 
provided by the tut
 2014-08-01 15:56:58 +07:00
rallytime
8dcedf684d Change more affected docs from Helium to 2014.7.0 2014-07-15 17:02:19 -06:00
vs
b1142570bc add note that points to multimaster_pki as an alternative setup 2014-07-15 03:42:39 -07:00
vs
f1a4b30020 add note that points to mulitmaster as an alternative setup 2014-07-15 03:42:21 -07:00
vs
f440b0f111 link in the multimaster_pki_tutorial 2014-07-15 03:41:12 -07:00
Thomas S Hatch
024485fb36 Merge pull request #14204 from terminalmage/docs 
Fix the rest of the double-colons in docs
 2014-07-14 16:01:13 -06: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
Erik Johnson
57096ca59c Convert double-colon to code-block 2014-07-14 12:37:13 -05:00
Erik Johnson
cc43b3cf4d Fix double-colon and remove redundant section 
There is a section in part 2 that is already covered in-depth in part 1,
this commit removes it.
 2014-07-14 12:34:03 -05:00
Thomas S Hatch
d2ca043327 Merge pull request #14195 from felskrone/master_signing_tutorial 
Master signing tutorial
 2014-07-14 11:17:16 -06:00
Volker Schwicking
d7b46395ff headings increased 2014-07-14 17:32:16 +02:00
Volker Schwicking
0f984aaf26 rewording, re-formatting 2014-07-14 17:21:12 +02:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Erik Johnson
16d59eb135 Fix rst note:: directives 2014-07-13 10:40:53 -05:00
Chris Rebert
a016a30508 fix typos in doc/topics/tutorials/intro_scale.rst 2014-07-11 15:46:54 -07:00
Thomas S Hatch
c2c9ea05e3 Merge pull request #14119 from gravyboat/develop 
Fixed a few more files with code block issues.
 2014-07-10 17:14:04 -06:00