valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,293 Commits 24 Branches 182 Tags 341 MiB
ba60b7972a
Commit Graph

62 Commits

Author SHA1 Message Date
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
 2016-05-19 16:22:36 -06:00
Jacob Hammons
146b4df6be Updates docs version to 2015.8.9 
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes
 2016-05-19 13:41:35 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/states/user.py
 2016-04-15 13:58:50 -06:00
C. R. Oldham
4242bc7399 Language clarification. 2016-04-15 12:20:56 -06:00
C. R. Oldham
965e3bc1d1 Expand on the open-source vs open-core FAQ 2016-04-15 12:20:56 -06: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
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
Erik Johnson
724b2f36ce Add file_tree/file.managed/contents_pillar example to FAQ 2016-01-11 16:45:56 -06:00
Erik Johnson
854c7d9978 Remove old FAQ item referencing gitfs bug in 0.16.x 
This release has been EOL for a long time, and is not even available
from pretty much any distro. It is safe to remove this item.
 2016-01-11 16:45:56 -06:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
 2015-10-20 14:47:49 -06:00
Jacob Hammons
2870af2ba3 added link to grains security FAQ to targeting and pillar topics. 2015-10-15 15:05:35 -06:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous 
Assorted style and minor updates
 2015-09-14 16:32:22 -06:00
Erik Johnson
656aec90b2 Fix wording of windows minion restart in FAQ 2015-08-17 13:39:20 -05:00
Seth House
dc6eac4f69 Deprecate Halite from the Salt docs 2015-05-05 16:01:35 -06:00
Vynce Montgomery
80d6e9ec94 fix link to bug reporting in FAQ 
linebreak and bad path; one way or another, this was not rendering as a link.
 2015-04-15 16:54:11 -07:00
Peter Smith
d836b2b3df Update faq.rst 
Fixed misspelling on "alternative" and updated cmd.run procedure to disconnect all input and output for the thread before executing the NOHUP.
 2015-03-08 00:54:50 -06:00
Mike Place
970c32ae8e Document the bug reporting procedure 2015-02-18 09:22:28 -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
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Michael Brown
9b39eae40c alternative way of restarting windows minion 2014-12-01 16:51:58 -05:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Seth House
daf0fe9937 Added nohup example to the FAQ about restarting Salt with Salt 
Suggested by @ in #7997.
 2014-11-14 12:40:18 -05:00
Thomas S Hatch
bc7217c331 Add comment to clarify confusion in faqs 2014-11-03 20:24:44 -07:00
Erik Johnson
d9e036630a Fix weird merge forward in FAQ 2014-10-22 10:26:48 -05: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
Erik Johnson
6ac209e6a7 Add example states for installing at and running atd 2014-10-08 16:50:47 -05:00
Thomas S Hatch
999d695d8f Merge branch '2014.7' into develop 
Conflicts:
	salt/output/key.py
 2014-09-26 14:54:00 -06:00
Erik Johnson
1a88ebf1f8 Update docs reference to Halite 
Halite is no longer "new", and shouldn't be referred to as such.
 2014-09-25 23:54:59 -05:00
Erik Johnson
aae0b3dcef Clarify salt-minion restart example in FAQ 2014-08-29 12:17:06 -05:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
rallytime
76340a5c62 Documentation for salting the salt master 2014-05-23 13:50:08 -06:00
Seth House
04057b27dc Added an example to the FAQ for how to restart Salt with Salt 
Closes #12243
 2014-04-30 13:55:58 -06:00
Colton Myers
6238abff5b Add more version compatibility information to the FAQ, Fix #10934 2014-03-05 10:35:29 -07:00
David Lindquist
9c91539de7 Replace mentions of 0.18.0 with 2014.1.0 2014-02-14 17:01:57 -08: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
Erik Johnson
3fb755b63c Add example about jobs.list_jobs, jobs.lookup_jid 
Sometimes the salt CLI will exit without displaying the return data from
all minions, but they do actually return data. This commit explains how
to use the jobs runners to obtain job return data and potentially catch
minions that did not return in these edge cases.
 2014-01-25 20:56:01 -06:00
Forrest Alvarez
52e6d273f6 updated the faq to add a note about backup_mode, fixed a typo in the backup mode docs, and updated one of the file.managed examples with a backup line, as well as an additional note directing the user to the backup mode documentation in a highly visible area. 2013-12-08 05:52:45 +00:00
Colton Myers
6f4372e5b6 Add FAQ about SELinux, Fix #8545 2013-11-15 15:13:05 -07:00
Forrest Alvarez
1b9849049a updated to faq file to reword backwards compatibility 2013-11-14 05:38:28 +00:00
Forrest Alvarez
139e3b3bb9 updated FAQ. 2013-11-14 04:49:54 +00:00
Thomas S Hatch
dfc90634a1 no longer future tense 2013-10-25 09:02:43 -06:00
Chris Rebert
1fe7df8650 faq.rst: fix typo 2013-09-23 11:59:37 -07:00
Erik Johnson
e685ebe23f Fix typo 2013-09-23 09:55:56 -05:00