valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,071 Commits 24 Branches 182 Tags 341 MiB
de3a1ce283
Commit Graph

3236 Commits

Author SHA1 Message Date
Erik Johnson
2849950bce Docs cleanup 
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
 2014-07-13 11:02:33 -05:00
Erik Johnson
16d59eb135 Fix rst note:: directives 2014-07-13 10:40:53 -05:00
David Boucha
a04e3d4a0b make sure twilio_notify shows up in the docs 2014-07-13 00:12:23 -06:00
David Boucha
98b7c1cdfd add links to 2014.1.7 Salt Windows installers 2014-07-12 23:21:06 -06:00
Pedro Algarvio
8c756836f2 Update 'doc/.tx/config' - Build #111 
http://cookingwithsalt.org/job/salt/job/transifex/111/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-13 00:43:56 +01:00
Chris Rebert
a016a30508 fix typos in doc/topics/tutorials/intro_scale.rst 2014-07-11 15:46:54 -07:00
Erik Johnson
4e84226d60 Fix spelling in release notes 2014-07-10 21:18:02 -06:00
Thomas S Hatch
02eb420163 Merge branch 'combine-requisites-and-altering_states' of https://github.com/lyft/salt into lyft-combine-requisites-and-altering_states 
Conflicts:
	doc/ref/states/altering_states.rst
 2014-07-10 19:55:27 -06: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
Thomas S Hatch
832cbfbfe8 Merge pull request #14115 from lyft/document-listen 
Add documentation for listen/listen_in
 2014-07-10 17:12:41 -06:00
Thomas S Hatch
a8ed8e1452 Merge pull request #14114 from catlook/develop 
Updated the Index.rst page to flow more smoothly
 2014-07-10 17:12:04 -06:00
Thomas S Hatch
7489599848 Merge pull request #14112 from kennyballou/arch_install_doc_update 
Update Arch Linux Installation Documentation
 2014-07-10 17:11:41 -06:00
Forrest Alvarez
0a96a4ca09 Updated the salt bootstra, and writing tests docs to fix some code block issues. 2014-07-10 15:47:51 -07:00
Forrest Alvarez
fd2ecf41bd Updated the debian and index doc files within the installation topic to fix code blocks. 2014-07-10 14:59:37 -07:00
Ryan Lane
0306ed00b8 Combine requisites and alterting_states into a global state arguments document 2014-07-10 14:59:12 -07:00
kballou
a270f08292 Update Arch Installation Header 
Related to change f40c97c12c
 2014-07-10 15:46:52 -06:00
Ryan Lane
3ef69f613a Add documentation for listen/listen_in 2014-07-10 14:39:56 -07:00
Cat Lookabaugh
e96c450caf Updated the Index.rst page to flow more smoothly 2014-07-10 16:38:32 -05:00
kballou
f40c97c12c Update Arch Linux Installation Documentation 
Arch Linux has official support for the `salt` package (including
dependencies), update installation instructions to reflect this change.

Related, restructure notes about installing development builds from AUR.
 2014-07-10 15:30:59 -06:00
Thomas S Hatch
ec70c6e9a1 flag lxc as beta 2014-07-10 14:44:31 -06:00
Thomas S Hatch
d1121f4a58 Merge pull request #14102 from gravyboat/develop 
Link documentation guide in contributing guide.
 2014-07-10 14:40:35 -06:00
Thomas S Hatch
fbfc09f740 Merge pull request #14101 from eliasp/docs-toc-list-ul 
Add missing <ul>[…]</ul> around list elements in sidebar TOC.
 2014-07-10 14:39:32 -06:00
Thomas S Hatch
487c5f5a33 Merge pull request #14083 from hvnsweeting/hvn-doc-update 
Salt virt/cloud doc update
 2014-07-10 14:36:35 -06:00
Thomas S Hatch
13c18f0629 Add headers to the 2014.7.1 to release notes, more to come 2014-07-10 13:35:11 -06:00
Forrest Alvarez
208832f9ab Fixed some spacing issues in the contributing docs. 2014-07-10 12:14:37 -07:00
Forrest Alvarez
846bc97bd2 Updated the contributing guide with a link to the documentation contribution docs. 2014-07-10 12:11:11 -07:00
Elias Probst
626e1b6fd4 Add missing <ul>[…]</ul> around list elements in sidebar TOC. 2014-07-10 20:59:43 +02:00
Thomas S Hatch
126462c0e5 Start on Helium release notes 2014-07-10 11:21:06 -06:00
Thomas S Hatch
9bcadf3c9a Merge pull request #14033 from ihrwein/add-syslog-ng-module 
Add syslog-ng state and execution module
 2014-07-10 10:09:37 -06:00
Volker Schwicking
3da7bf5fc9 rewording 2014-07-10 17:27:31 +02:00
Hung Nguyen Viet
326cae6dbc add basic usage doc for salt-cloud 2014-07-10 18:06:43 +07: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
Hung Nguyen Viet
6fa10009c0 add document for installing salt-cloud on Ubuntu 
as saying that salt cloud is merged to Salt may cause confusing
make user thinks no need to install salt-cloud pkg
 2014-07-10 13:01:06 +07:00
Hung Nguyen Viet
fef3b93bec rewrite some sentences 2014-07-10 11:28:18 +07:00
Hung Nguyen Viet
81d74c1080 avoid confusing with salt-cloud 2014-07-10 11:15:17 +07:00
C. R. Oldham
426e958296 merge commit 2014-07-09 16:10:44 -06:00
Colton Myers
3ec4d92576 Add 2014.1.7 release notes 2014-07-09 16:08:25 -06:00
Colton Myers
d11bcd60d3 Update docs to 2014.1.7 release 2014-07-09 14:58:56 -06:00
btibi
851ce0fde4 Add syslog_ng execution module. 2014-07-09 22:42:36 +02:00
C. R. Oldham
6b52ca55a3 Restore master_tops functionality and add more documentation. 2014-07-09 14:37:59 -06:00
btibi
f69977d3e5 Add syslog_ng state module. 2014-07-09 22:04:13 +02:00
Thomas Jackson
71f97b9ee7 Update to the salt @ scale doc 2014-07-09 11:06:24 -07:00
Colton Myers
fefa665252 Add master_tops and ext_nodes to release notes for 2014.1.6 2014-07-09 09:30:35 -06:00
vs
79589a2b0c added \n 2014-07-09 02:05:10 -07:00
Colton Myers
5de50f13ce Update docs to 2014.1.6 release 2014-07-08 15:33:07 -06:00
Colton Myers
437b4816ca Update the release date for 2014.1.6 2014-07-08 09:28:58 -06:00
Thomas S Hatch
47f3e269fe Merge pull request #14009 from cro/add_full_pubkey2 
Add full gpg key
 2014-07-07 15:07:51 -06:00
Thomas S Hatch
eabd156d67 Merge pull request #13917 from felskrone/salt_at_scale_doc 
Salt at scale doc
 2014-07-07 14:41:37 -06:00
C. R. Oldham
3b794c8450 Add full gpg public key. 2014-07-07 14:39:07 -06:00
Pedro Algarvio
6410f4ba59 Update 'doc/.tx/config' - Build #104 
http://cookingwithsalt.org/job/salt/job/transifex/104/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-07 00:28:16 +01:00
Erik Johnson
7dc67a7ce8 Convert :: to code-block 2014-07-06 16:43:51 -05:00
Erik Johnson
67df3a9db4 Fix code-block 
This is another fix to make the docs more accurate with the new sphinx
theme.
 2014-07-05 22:51:05 -05:00
Seth House
92ebf99a1f Added security disclosure proceedure page 
Closes #2315
 2014-07-03 20:32:52 -06:00
Seth House
ddc4353248 Added central links for the various mailing lists 2014-07-03 20:32:26 -06:00
Erik Johnson
1b1eb26587 Add reactor example for updating fileserver on git push 2014-07-02 21:03:09 -05:00
Colton Myers
9537ada5d2 Add newest cherry-pick to 2014.1.6 release notes 2014-07-02 16:38:40 -06:00
Volker Schwicking
71d3ba021b more formatting fixes 2014-07-02 19:25:01 +02:00
Volker Schwicking
2b30ab119b add missing log messages 2014-07-02 18:29:09 +02:00
Thomas S Hatch
4eccf705cb Merge pull request #13905 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #99
 2014-07-02 10:17:51 -06:00
Volker Schwicking
4c2949a267 formatting improvements, little text rework 2014-07-02 14:32:19 +02:00
Volker Schwicking
4099a9d5fc formatting improvements, little text rework 2014-07-02 14:31:49 +02:00
Volker Schwicking
14a0441dec formatting improvements, little text rework 2014-07-02 14:29:35 +02:00
Volker Schwicking
06baca4cf5 formatting codeblocks etc. 2014-07-02 13:51:47 +02:00
Volker Schwicking
e7838c3641 formatting and text reworks 2014-07-02 13:44:50 +02:00
Volker Schwicking
2e8e00f879 fix note to display as note 2014-07-02 12:44:52 +02:00
Volker Schwicking
b086f8d2c7 fixed to 80 chars in width 2014-07-02 12:39:58 +02:00
vs
e9796459fb first draft of multimaster pki tutorial 2014-07-02 02:52:19 -07:00
Erik Johnson
1b9660a40a Fix 2nd person 2014-07-01 23:42:03 -05:00
Seth House
030035e1ff Run xelatex three times to catch the TOC 2014-07-01 19:10:46 -06:00
Pedro Algarvio
1eea61aeaa Update 'doc/.tx/config' - Build #99 
http://cookingwithsalt.org/job/salt/job/transifex/99/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-02 00:47:44 +01:00
rallytime
6caff78b18 Remove random :'s 2014-07-01 15:11:51 -06:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Thomas S Hatch
1cd95aa0c8 Revert "Sign the masters pub-key" 2014-06-30 15:04:53 -06:00
Thomas S Hatch
eda36a01a3 Merge pull request #13570 from felskrone/sign_master_keys 
Sign the masters pub-key
 2014-06-30 15:04:23 -06:00
Colton Myers
e1445e5cf7 Merge pull request #13852 from basepi/2014.1.6releasenotes 
Add two fixes to release notes for 2014.1.6
 2014-06-30 14:50:55 -06:00
Colton Myers
30efb97b30 Add two fixes to release notes 2014-06-30 14:50:24 -06:00
Seth House
918f12a376 Added roster modules to the documentation 2014-06-30 14:01:48 -06:00
Erik Johnson
06abbb02c7 Add rh_service bugfixes to 2014.1.6 release notes 2014-06-30 13:50:53 -05:00
Forrest Alvarez
55916e8a7b Update best_practices doc for code block issues. 2014-06-29 00:37:29 +00:00
Erik Johnson
b4a5f7c1bb Use code-block instead of double-colon + indent 
The new sphinx style assumes that indented examples preceded by a
double-colon are python. This changes he main walkthrough page so it
uses a bash code-block in these areas, to be more accurate.
 2014-06-28 14:35:21 -05:00
Seth House
afde747f46 Merge pull request #13817 from rallytime/cloud_extends_docs 
Clarify cloud configuration extends behaviors
 2014-06-27 19:03:26 -06:00
rallytime
0636f2cb77 Clarify list merging and non-recursive behaviors of extends in cloud.config 2014-06-27 18:55:52 -06:00
Seth House
7725350416 Merge pull request #13811 from lyft/doc-additions 
Add docs for boto_elasticache and apache_module
 2014-06-27 17:10:10 -06:00
Thomas S Hatch
0a611598e6 Merge pull request #13803 from claytron/version-numbers 
Clarify version numbering scheme
 2014-06-27 13:23:07 -06:00
Clayton Parker
dfec35fe47 fix error on make clean with no translations 2014-06-27 13:45:39 -04:00
Clayton Parker
33e6cd6191 clarify the version numbering scheme 2014-06-27 13:45:13 -04:00
Joseph Hall
9b5a6d575e Merge pull request #13790 from danielrowles-wf/ec2-secondary-ip-addresses 
Add support for adding secondary IP addresses to network interfaces
 2014-06-27 07:26:15 -06:00
vs
cfa163d4fb Merge remote-tracking branch 'upstream/develop' into sign_master_keys 2014-06-27 03:52:30 -07:00
Mike Place
c255b4ad13 Update glossary.rst 
Re-word external pillar
 2014-06-26 16:41:33 -06:00
Mike Place
0a42bf0678 External pillar glossary entry 2014-06-26 16:20:11 -06:00
Mike Place
126e84a081 Glossary entry for master tops 2014-06-26 16:13:57 -06:00
Mike Place
2c27cc1a34 Add __virtual__ to glossary 2014-06-26 16:07:30 -06:00
Dan Rowles
329351313a Add support for adding secondary IP addresses to network interfaces 
when provisioning EC2 instances with salt-cloud.
 2014-06-26 20:29:15 +00:00
rallytime
7778a6e24d clarifications to gce cloud docs 2014-06-26 11:31:52 -06:00
Mike Place
22d2e812ef Merge pull request #13751 from claytron/doc-fixes 
fix errors in docs
 2014-06-25 21:28:35 -06:00
Clayton Parker
23c494c8ce fix errors in docs 2014-06-25 22:54:37 -04:00
Colton Myers
f53e3b4a54 Add 2014.1.6 release notes 2014-06-25 15:05:44 -06:00
Joseph Hall
337f03bb3d Merge pull request #13737 from christabor/syntax-labels 
Add a fix for long lines.
 2014-06-25 14:03:51 -06:00
Christobot
a7d62f5b8f Add a fix for long lines. Fixes #13724 2014-06-25 12:57:09 -07:00
vs
f54b90b07c pylinting, better log messages, docstrings, no logic changes 2014-06-25 06:26:01 -07:00
Thomas S Hatch
d5504945e8 Merge pull request #13718 from christabor/syntax-labels 
Add new styles for code blocks
 2014-06-25 00:08:48 -06:00
christobot
9786fe45d6 Add new styles for code blocks - addresses #13215 2014-06-24 22:30:09 -07:00
Thomas S Hatch
caf8c4094a Merge pull request #13701 from cachedout/pillar_doc_brushup 
Improve initial pillar doc
 2014-06-24 21:30:49 -06:00
Thomas S Hatch
22c3588c24 Merge pull request #13689 from rallytime/digital_ocean_docs 
Update Digital Ocean docs to include ssh_key_file requirements
 2014-06-24 21:24:23 -06:00
Mike Place
915570f045 Formalize a policy for initializing dictionaries. 2014-06-24 18:35:13 -06:00
Mike Place
e01becc217 Improve initial pillar doc 
I think the pillar intro was too light on details. Hopefully this makes
it easier to follow.
 2014-06-24 16:47:45 -06:00
rallytime
c482bf2e6c Update "Getting Started with Digital Ocean" docs to include ssh requirements 2014-06-24 14:47:00 -06:00
Daniel Wallace
4d8d2fa377 Document match for overstates 
Uses compound matching. Closes #13659
 2014-06-23 19:19:47 -05:00
Henrik Holmboe
e0a6a5a13e Reflect the latest released version 
I did this exact PR in #12695 the last time around. Luckily #12720 seems to take a stab at automating this. :)
 2014-06-23 19:56:39 +02:00
Pedro Algarvio
1f0e0d4465 Remove doc/man/salt-api.7 2014-06-21 19:00:55 +01:00
Pedro Algarvio
99dfb00805 Update 'doc/.tx/config' - Build #88 
http://cookingwithsalt.org/job/salt/job/transifex/88/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-06-21 13:36:03 +01:00
Thomas Jackson
c721d9d664 Seperate saltnado_websockets from the rest of the implementation. 2014-06-20 15:10:56 -07:00
Seth House
d2f82c8bba Removed incorrect TOC syntax from netapi index 2014-06-20 10:21:18 -06:00
Seth House
acb203c735 Added salt-api to CLI TOC 2014-06-20 10:20:58 -06:00
Seth House
c9579866e4 Make mention of salt-api in the netapi modules links 
People will be searching for this term.
 2014-06-20 10:17:15 -06:00
Joseph Hall
2fad262ced Merge pull request #13581 from basepi/releasecherrypick 
Add some notes about cherry-picking
 2014-06-20 06:33:48 -06:00
Colton Myers
df7ef6f504 Fix typo 2014-06-19 16:19:20 -06:00
Colton Myers
a41b4107ea Add some notes about cherry-picking 2014-06-19 16:17:46 -06:00
Seth House
8f5e336a16 Added link to the writing netapi modules doc 2014-06-19 13:22:57 -06:00
Seth House
14f663f37e Added link to legacy salt-api release notes 2014-06-19 13:20:05 -06:00
Seth House
9f93aaf016 Renamed old autodoc-generated salt-api netapi module filenames 2014-06-19 13:19:24 -06:00
Seth House
d4f64e8d5d Disable the 'routing table' index from the httpdomain 
While very cool and quite handy, it doesn't make sense for how we use
netapi modules in Salt.
 2014-06-19 13:13:09 -06:00
Seth House
6d09e554e4 Fixed two straggling occurances of APIClient -> NetapiClient 2014-06-19 13:02:16 -06:00
Seth House
cbc3775fbc Remove the sphinxcontrib from the import path 
I swear I fixed this during the merge. Must have undone the change
somehow.
 2014-06-19 12:27:31 -06:00
Thomas S Hatch
b6cc31e8af Merge pull request #13554 from whiteinge/saltapi-merge 
salt-api merge!
 2014-06-19 11:44:52 -06:00
Pedro Algarvio
1a9a7fb87e Merge branch 'develop' of github.com:saltstack/salt into hotfix/saltapi-merge-tests 2014-06-19 12:01:33 +01:00
Ronan Amicel
77dfa9eff4 Docs: fix list formatting on the Installation page 2014-06-19 11:56:28 +02:00
Thomas S Hatch
060f34f746 Merge pull request #13526 from s0undt3ch/hotfix/setup-raet 
simpler requirements setup
 2014-06-18 23:55:01 -06:00
Nitin Madhok
2e27b9d1df Fixed typo 2014-06-19 01:40:39 -04:00
Seth House
295e0b9060 Temporarily commented out docs Mock decorator conditional 
This worked in the smaller salt-api project but is choking somewhere in
the larger Salt project. We do need this but we need the salt-api merge
sooner. Commented out for now.
 2014-06-18 23:20:27 -06:00
Seth House
061a43b6f3 Added netapi docs to TOC 2014-06-18 23:19:45 -06:00
Seth House
8df1bbf1d1 Added missing functools import 2014-06-18 23:05:26 -06:00
Seth House
ae413133f3 Added netapi modules to the module index 2014-06-18 23:04:45 -06:00
Seth House
7b6544c660 Added httpdomain from Sphinx-contrib 2014-06-18 22:14:17 -06: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
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
Seth House
6f112d6eef Updated the netapi modules index to be more clear 2014-06-18 20:19:03 -06:00
Seth House
554a612aa4 Renamed netapis to netapi 2014-06-18 20:05:02 -06:00
Seth House
cf4b684edb Moved salt-api release notes into saltapi subdir 2014-06-18 20:03:40 -06:00
Seth House
598a1d74a3 Removed redundant docs files with Salt-core docs 2014-06-18 20:02:16 -06:00
Seth House
d01462cb28 Retain docstring if mocked object is used as a decorator 
This prevents mocked objects that are used as decorators from obscuring
the docstring of the decorated function/method.
 2014-06-18 15:28:20 -06:00
Seth House
de3e1d31ce Removed mocks for unused libraries 
These mocks were all for legacy code.
 2014-06-18 15:28:20 -06:00
Colton Myers
6cb859b6da Merge pull request #13394 from basepi/2014.1.5release 
Add release notes for 2014.1.5 and bump docs version
 2014-06-18 10:27:59 -06:00
Thomas S Hatch
7b1950b803 Merge pull request #13468 from techhat/db 
Add sdb loader type
 2014-06-18 10:04:29 -06:00
Seth House
704c889066 Added local TOC for the rest_cherrypy URL list 2014-06-17 21:38:13 -06:00
Seth House
13e89c6ac6 Merge pull request #158 from pass-by-value/websocket_tornado 
Websocket tornado
 2014-06-17 21:07:28 -06:00
Pedro Algarvio
33b1532239 Remove ending install 2014-06-18 00:46:59 +01:00
Pedro Algarvio
acf51004f8 Update documentation accordingly 2014-06-18 00:36:35 +01:00
Erik Johnson
a1f5be53dc Remove pillar page from targeting toctree 2014-06-17 17:23:31 -05:00