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
70,291 Commits 24 Branches 182 Tags 341 MiB
dca04727b5
Commit Graph

91 Commits

Author SHA1 Message Date
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 14:12:48 -04:00
Mike Place
42c5058a1e Add tcptraceroute suggestion to minion troubleshooting docs (#33862) 
Closes #33627
 2016-06-08 12:19:27 -04:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00
Nicole Thomas
00f9090928 Add docs about PyYAML's 1024 character limitations for simple keys (#33459) 
Fixes #33389
 2016-05-24 08:12:21 -07:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
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
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Jonathan Ballet
4062c63b9f Fix doc formatting for yaml_idiosyncrasies 2016-01-25 12:26:30 +01:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07: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
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -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
Zach Malone
2bc17047b2 Adding double quote notes 
false and no or true and yes values need to be wrapped in double quotes (' and " together), which was not previously noted in the docs.
 2015-10-22 12:39:14 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -06: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
Nitin Madhok
3306ac2e21 Including doc in toctree 2014-11-18 03:26:54 -05: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
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Colton Myers
92742f7e08 No second person 2014-08-13 17:33:06 -06:00
Forrest
39b4c21c3d Fix a typo in the master conf. 2014-08-13 11:09:05 -07:00
Forrest
5145e3b448 Fix a typo 2014-08-13 11:08:35 -07:00
Forrest Alvarez
c4e55d9b84 Update the master and minion guides to discuss timeout settings. 2014-08-13 04:54:11 +00:00
Colton Myers
ff8d8df1d2 Add additional example for datetime YAML idiosyncrasy 
Fixes #14860
 2014-08-12 16:25:43 -06:00
Erik Johnson
57096ca59c Convert double-colon to code-block 2014-07-14 12:37:13 -05:00
Colton Myers
3c3bc18068 Clarify yaml indentation issues, and add another example 2014-06-05 17:20:53 -06:00
Forrest Alvarez
8c8060e6ea Updated the troubleshooting index with some link fixes for 12791. 2014-05-21 02:42:12 +00:00
Thomas S Hatch
10a475ded2 Documentation to fix #6300 2014-05-14 13:56:54 -06:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Colton Myers
cdf039163e Add YAML datetime idiosyncrasy to docs 
Refs #11630
 2014-03-31 11:46:21 -06:00
Mike Place
b6691b3166 Change timeout docs. 
Closes #10642
 2014-03-14 13:47:08 -06:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07: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
regilero
3784c2f80d Add documentation on yaml_utf8 setting on yaml troubleshooting documentation 2014-01-23 15:09:03 +01: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
Alexey Ivanov
1892c4ef84 docs: added note about SIGINFO and Ctrl+T un BSD/Mac 2014-01-13 00:51:11 -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