rallytime
7554d0f42d
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/states/include.rst
- doc/topics/cloud/reactor.rst
- doc/topics/reactor/index.rst
- doc/topics/releases/2015.5.10.rst
- doc/topics/tutorials/states_pt5.rst
- doc/topics/windows/windows-package-manager.rst
- salt/config.py
- salt/modules/state.py
- salt/states/grains.py
- tests/integration/modules/sysmod.py
- tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
...
Resolves #32037 .
2016-03-21 22:56:17 -05:00
Jacob Hammons
0d2111d397
Assorted doc bug fixes
...
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
2016-01-07 14:08:30 -07:00
Colton Myers
4b706ac76a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/troubleshooting/master.rst
2015-11-12 12:33:27 -07:00
Colton Myers
f8b8441485
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-11-12 11:01:07 -07:00
Mike Place
1874300e08
Add note about recommended umask
...
Closes #28199
2015-11-09 15:46:57 -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
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08: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
Mike Place
8255451803
Add docs about auth retry options
2014-09-15 12:40:43 -06:00
Forrest
39b4c21c3d
Fix a typo in the master conf.
2014-08-13 11:09:05 -07:00
Forrest Alvarez
c4e55d9b84
Update the master and minion guides to discuss timeout settings.
2014-08-13 04:54:11 +00:00
Erik Johnson
57096ca59c
Convert double-colon to code-block
2014-07-14 12:37:13 -05:00
Chris Rebert
8af229253f
more copyediting
2014-04-30 13:55:48 -07:00
Mike Place
b6691b3166
Change timeout docs.
...
Closes #10642
2014-03-14 13:47:08 -06: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
Alexey Ivanov
1d5c21fd89
master: added live profiling support via yappi
...
This allows low-overhead adhoc profiling of production servers without
interrupting service.
2014-01-13 23:10:05 -08:00
Erik Johnson
0fe0caebc3
Add note about upstart to resource limits documentation
2013-12-30 11:43:58 -06:00
Erik Johnson
84c6b62005
More refinement of master/minion troubleshooting docs
...
Added an nmap example for checking if ports are open, removed some
redundant wording, and reworded other parts to be more concise.
2013-12-29 20:13:11 -06:00
Forrest Alvarez
c0c5bfd526
Updated the master troubleshooting doc with details regarding unexpected behavior with the -c option.
2013-12-29 06:30:37 +00:00
Erik Johnson
c1eee828fd
Slight tweak to earlier master troubleshooting page edit
2013-12-28 22:10:03 -06:00
Erik Johnson
2087462bd9
Enhancement to master troubleshooting docs
...
Made some of the language more concise, and improved the example on
setting resource limits. /etc/security/limits.d/NN-something.conf is
the generally preferred method of setting resource limits.
2013-12-28 14:18:24 -06:00
Forrest Alvarez
6ab38c7484
Updated the master troubleshooting doc with a note about modifying the timeout.
2013-12-26 04:01:19 +00:00
Forrest Alvarez
8f746fe429
Added a line explaining that the user would need to re-establish their sessions as the user they modified the limits for in the master troubleshooting guide.
2013-12-24 23:55:08 +00:00
Forrest Alvarez
59aeca95d4
Updated the master troubleshooting docs with an example of modifying the limits.conf.
2013-12-24 23:43:36 +00:00
Erik Johnson
a625f75ce8
Fix line that was indented too far in code-block
2013-12-23 13:39:31 -06:00
Forrest Alvarez
ef303d2807
Fixed a typo in the troubleshooting index, copied over some content from the index to both the master and the minion, and cleaned them up to be more relevant to each.
2013-12-23 05:43:58 +00:00
Forrest Alvarez
17c8af56c9
Made some more updates to the master and minion troubleshooting docs to get rid of errors.
2013-12-21 06:38:47 +00:00
Forrest Alvarez
b3c6c6b56e
Updated the contents.rst so it pulls in more info from the topics, added some preliminary data for the master/minion docs so it stops erroring, did not delete the relevant sections from the main index.
2013-12-21 06:19:45 +00:00
Forrest Alvarez
f77cc4e68f
Updated the index of the troubleshooting docs with some new links to master and minion docs, added those, did not add content yet.
2013-12-16 06:09:12 +00:00
