Mike Place
3767666ccb
Note the presence of master_alive_interval in MM docs.
...
Refs #14906
2014-10-23 11:47:00 -06:00
Erik Johnson
d19c6b16ce
Improve wording of RPM changes in helium release notes
2014-10-23 12:00:35 -05:00
Erik Johnson
b261c663fa
Add notice of new packages for Helium release
2014-10-23 11:48:40 -05:00
Sean Coates
9e1685da6f
change Release Candidate installation doc from rc3 to rc4
2014-10-23 11:32:53 -04:00
vs
692252f41b
Merge branch 'sreq_cache_option' into optional_sreq_caching
2014-10-23 15:55:26 +02:00
Janek Warchoł
e11e42eb39
Fix external link formatting in glossary
2014-10-23 13:45:26 +02:00
Seth House
872e3286c0
Swap out SaltConf15 sidebar image for one with better scaled fonts
2014-10-22 16:26:26 -06:00
Colton Myers
fb2ae7cfbf
Merge pull request #16822 from whiteinge/doc-reactor-changes
...
Added versionadded and versionchanged directives to Reactor docs
2014-10-22 15:08:39 -06:00
Seth House
1faec87514
Added versionadded and versionchanged directives to Reactor docs
...
Also reworded and cross-linked the client interfaces docs.
2014-10-22 15:07:05 -06:00
Erik Johnson
86078aea8c
Normalize release notes with develop branch
2014-10-22 14:42:37 -05:00
Nicole Thomas
72537f0ee4
Merge pull request #16813 from holmboe/v2014.1.13-relnotes-in-develop
...
Point to the correct latest 2014.1.13 release
2014-10-22 10:16:53 -06:00
Erik Johnson
d9e036630a
Fix weird merge forward in FAQ
2014-10-22 10:26:48 -05:00
Henrik Holmboe
5d7184491f
Document assigned codenames
2014-10-22 17:20:40 +02:00
Henrik Holmboe
6a6fc4de6e
Update conf.py as well
2014-10-22 17:10:18 +02:00
Henrik Holmboe
20ee003c5f
Point to the correct latest 2014.1.13 release
...
This is recurring and #12720 is tracking the issue.
2014-10-22 16:12:48 +02:00
rallytime
1ed3d1827e
Release notes for 2014.1.13
2014-10-22 16:12:03 +02:00
Henrik Holmboe
d4258e9040
Point to the correct latest release
...
This is recurring and #12720 is tracking the issue.
2014-10-22 15:56:00 +02:00
Thomas S Hatch
cb14a8660e
fix docs for mod_aggregate per #16575
2014-10-21 16:37:34 -06:00
jimmystewpot
271f6c4257
Update aws.rst
...
remove note it was a typo
2014-10-21 16:20:46 +11:00
jimmystewpot
8fd88cc0d3
Update aws.rst
...
Updated the document to reflect a storage type that would work. Currently only gp2 and standard function because there is no support for the provisioned iops
2014-10-21 16:18:31 +11:00
jimmystewpot
9edaf65bbe
Update aws.rst
...
added additional component for Ebs.
2014-10-21 15:59:02 +11:00
jimmystewpot
abd8437205
Update aws.rst
...
Added undocumented feature for Ebs.VolumeType to the example so people do not need to read the source to identify how to change the EBS volume Type:
2014-10-21 15:57:42 +11:00
Thomas S Hatch
9992edfdca
Merge branch '2014.7' into develop
...
Conflicts:
salt/loader.py
2014-10-20 15:52:31 -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
Erik Johnson
af25ad1019
Improvements to releases page
...
This clarifies what the current stable release is. It also hides the
2014.7.0 release notes until we actually release that version.
2014-10-20 14:11:51 -05:00
rallytime
559ed2906b
Fix small typo in fedora installation docs
2014-10-20 12:06:46 -06: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
Thomas S Hatch
2e9b63ed31
Add notes on cp module and -W/w
2014-10-18 09:24:31 -06:00
Thomas S Hatch
7a72ef2e27
Merge pull request #16688 from Supermathie/16682
...
Add documentation addressing how to listen for events on minion
2014-10-17 10:51:57 -06:00
Seth House
4846dcebbd
Update the Reactor docs to use the local method instead of cmd
2014-10-17 09:17:34 -05:00
Mike Place
a3aa876008
Merge pull request #16697 from cachedout/ssh_timeout_doc_fix
...
Clarify doc
2014-10-16 16:10:27 -06:00
Mike Place
36288eef7f
Clarify doc
2014-10-16 16:09:57 -06:00
Michael Brown
53e5b9ee09
Add documentation addressing how to listen for events on minion
...
* Address #16682
2014-10-16 14:55:34 -04:00
vs
2e1d3b07b8
add cache_sreqs option to minion documentation
2014-10-16 07:33:37 +02:00
Erik Johnson
48e81ac32d
Add new fileserver features to helium release notes
...
Also made some formatting fixes
2014-10-15 22:44:43 -05:00
Erik Johnson
49c7e6ac1a
Fix misspelled code-block type
2014-10-15 22:44:27 -05:00
Erik Johnson
00bd8477dd
Fix sphinx build error
...
There is no 'math' lexer in sphinx.
2014-10-15 22:43:37 -05:00
Erik Johnson
bb6de490ef
Grammar correction
2014-10-15 22:36:12 -05:00
Seth House
fc28d00056
Added SaltConf15 banner and links to sidebar
2014-10-14 19:44:36 -05:00
Mike Place
d0e90c77a6
Typo fix
2014-10-14 13:18:54 -06:00
Mike Place
0fcc0b5ae7
Document pillar ovewrite strategy
2014-10-14 13:07:26 -06:00
Thomas S Hatch
9ec90bafea
Merge branch '2014.7' into develop
...
Conflicts:
salt/output/__init__.py
2014-10-13 17:41:42 -06:00
Thomas Jackson
e60f47052e
Update ACL docs to include @jobs markup
2014-10-13 16:13:23 -07: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
Stephen Wood
1be08146c8
Fix minor typos.
2014-10-11 17:03:38 -07:00
Joseph Hall
130e0842c8
Merge pull request #16566 from terminalmage/docs
...
Minor wording fix in highstate docs
2014-10-11 06:34:39 -06:00
Erik Johnson
af64f17fe4
Minor wording fix in highstate docs
...
This fixes some grammar weirdness.
2014-10-10 22:25:55 -05:00
rallytime
54b7abdb17
Fix conf_minion references
2014-10-10 09:19:27 -06:00
Joseph Hall
f49647a4e2
Merge pull request #16486 from rallytime/docs_minion_config
...
Add recon_* config options to minion docs
2014-10-09 17:08:29 -06:00
Nicole Thomas
2901e9439b
Merge pull request #16514 from cachedout/master_doc_fix
...
Small doc fixes
2014-10-09 15:07:17 -06:00
Mike Place
11ef20fdf5
Small doc fixes
2014-10-09 10:14:37 -06:00
Thomas S Hatch
fecb0dfebb
Merge pull request #16497 from thatch45/notes_2014.7
...
Add some release notes updates
2014-10-08 17:30:43 -06:00
Thomas S Hatch
678a551783
Add soem release notes updates
2014-10-08 16:40:34 -06:00
Seth House
57f2c4a4e3
Merge pull request #16494 from terminalmage/zeromq4
...
Add information on how to upgrade to ZeroMQ 4 in Ubuntu and RHEL/CentOS
2014-10-08 16:06:37 -06:00
Erik Johnson
8c80efd8eb
Add info on upgrading to ZeroMQ 4
2014-10-08 16:56:28 -05:00
Erik Johnson
391a07e6ac
Add info on upgrading to ZeroMQ 4
2014-10-08 16:51:33 -05:00
Erik Johnson
6ac209e6a7
Add example states for installing at and running atd
2014-10-08 16:50:47 -05:00
Colton Myers
710795b3b3
Merge pull request #16492 from saltstack/2014.7
...
Merge forward 2014.7 into develop
2014-10-08 15:25:56 -06:00
Colton Myers
5e25de90e9
Add 2014.1.12 release notes
2014-10-08 15:22:33 -06:00
Seth House
b0615f9bbf
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-08 14:40:32 -06:00
rallytime
6d1c14b1be
Add recon_* config options to minion docs
...
Fixes #16471
2014-10-08 14:11:34 -06:00
Elias Probst
6a2936886f
Fix again what was supposed to be fixed in PR#14101.
...
The initial problem was, that the <li> elements for the JS-generated
TOC weren't placed inside <ul></ul>, but after it.
2014-10-08 17:23:22 +02:00
Colton Myers
000b391f2f
State Module, not State Declaration
2014-10-07 19:25:44 -06:00
Colton Myers
71f422fd4d
Merge branch '2014.7' into develop
2014-10-07 15:10:40 -06:00
Colton Myers
059416e75b
Update release candidate installation instructions for rc3
2014-10-07 15:09:16 -06:00
Colton Myers
8133d7d5c6
Update to 2014.1.11 in docs sidebar
2014-10-07 15:08:32 -06:00
Colton Myers
e1d2d7cb6b
Update to rc3 in docs sidebar
2014-10-07 15:08:21 -06:00
David Boucha
8464201a71
add links to Windows 2014.1.11 installers
2014-10-07 11:52:53 -06:00
Thomas S Hatch
d4eaf2323e
Merge pull request #16339 from cachedout/module_fail_reasons
...
Module failure reporting
2014-10-07 10:21:37 -06:00
Erik Johnson
cd1cce3baa
Merge pull request #16400 from steverweber/doc_ipython
...
ipython log to look for
2014-10-06 22:07:41 -05:00
Mike Place
450ffb1c77
Merge branch 'develop' into module_fail_reasons
2014-10-06 11:09:02 -06:00
Thomas S Hatch
69b6a1c313
Merge branch '2014.7' into develop
2014-10-06 11:02:27 -06:00
Steve Weber
54b9aedbf7
ipython log to look for
2014-10-06 12:54:36 -04:00
Thomas S Hatch
8e35c6d0ff
Merge pull request #16389 from JensRantil/fix-client-acl-doc
...
Fix incorrect client ACL documentation
2014-10-06 10:34:44 -06:00
Thomas S Hatch
38da77976c
Merge pull request #16368 from Supermathie/16366
...
documentation: add salt/ event prefix and explain how to get event tag while listening for events
2014-10-06 10:21:00 -06:00
Jens Rantil
53153277ce
Fix incorrect client ACL documentation
...
Tested this by setting up a local Vagrant instance using the following
procedure:
1. Made a fresh minion/master install (using salt-bootstrap) of version
2014.1.10.
2. Adding a `test.ping` ACL rule for the `vagrant` user.
3. Asserting that I couldn't execute `salt '*' test.ping'` as `vagrant`
user.
4. Applying `chmod 755 /var/cache/salt /var/cache/salt/master/jobs
/var/run/salt /var/run/salt/master`.
5. Verifying that `salt '*' test.ping'` now works.
Fixes #16318 .
2014-10-05 10:40:37 +02: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
Michael Brown
c928b09a9d
documentation: add salt/ event prefix and explain how to get event tag while listening
...
* partially addresses #16366
2014-10-03 16:37:08 -04:00
C. R. Oldham
670a39a580
Add warning for FC19 users.
2014-10-03 13:29:41 -06:00
Mike Place
2abc93afe6
Merge branch 'develop' into module_fail_reasons
2014-10-03 13:08:39 -06:00
Mike Place
1975043730
Merge pull request #16332 from rallytime/fedora_docs
...
Add intalling from testing section to fedora installation docs
2014-10-03 13:06:27 -06:00
C. R. Oldham
3fef918352
Add warning for FC19 users.
2014-10-03 12:52:46 -06: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
Mike Place
a5e1540f22
Provide a facility for modules to report the reasons they cannot be
...
loaded.
2014-10-02 15:43:10 -06:00
rallytime
b6075c7425
Add intalling from testing section to fedora installation docs
2014-10-02 13:44:22 -06:00
Joseph Hall
d65d12a460
Correct formatting of PagerDuty
2014-10-02 13:27:13 -06:00
Jeremy Rosenbaum
4668480dff
fixes inconsistent bar/baz variable name in state module example
2014-10-01 21:53:45 -07:00
Chris Rebert
5ec98a7c4f
fix typos in doc/ref/configuration/master.rst
2014-10-01 14:06:11 -07:00
Joseph Hall
4aadff6d2b
Add Reactor tutorial to index
2014-09-30 12:57:48 -06:00
Joseph Hall
dc88103cdf
Add tutorial on using Salt Cloud with the Event Reactor
2014-09-30 12:50:47 -06: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
Thomas S Hatch
3ace3e1405
Merge pull request #16241 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #166
2014-09-29 20:02:59 -06:00
Thomas S Hatch
471efd9236
Merge pull request #16217 from trebuchet-deploy/use-master-when-local-option
...
Add a use_master_when_local option to allow remote execution while using...
2014-09-29 19:56:08 -06:00
Thomas S Hatch
49b3646ad6
Merge pull request #16211 from rallytime/runtests_doc
...
Add info about running unittests w/o integration test daemons
2014-09-29 19:51:05 -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