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
39,326 Commits 24 Branches 182 Tags 341 MiB
fbf8e5be0e
Commit Graph

3657 Commits

Author SHA1 Message Date
Sandra Kosmalla
de5baa14a2 fix syntax error in writing grains code snippet 2014-11-05 11:33:14 +01:00
Thomas S Hatch
23d58132eb Merge branch '2014.7' into develop 2014-11-04 15:33:56 -07:00
Thomas S Hatch
b3d2edc9a5 Merge branch '2014.7' into develop 2014-11-04 15:11:23 -07:00
Pedro Algarvio
a114dab27d Update 'doc/.tx/config' - Build #196 
http://cookingwithsalt.org/job/salt/job/transifex/196/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-11-04 21:51:34 +00:00
Thomas S Hatch
608d053844 Merge pull request #17121 from plastikos/improvement-yaml_quote 
Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters...
 2014-11-04 14:02:05 -07:00
Thayne Harbaugh
11c0999c66 Add a note to formulas documentation describing yaml_dquote filter. 2014-11-04 12:54:16 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Thomas S Hatch
e0904c5b17 Merge pull request #17114 from holmboe/man-clarify 
Some clarifications mainly in the Salt man page
 2014-11-03 21:02:33 -07:00
Thomas S Hatch
bc7217c331 Add comment to clarify confusion in faqs 2014-11-03 20:24:44 -07:00
Colton Myers
dd67f54abe Merge branch '2014.7' into develop 
Conflicts:
	setup.py
 2014-11-03 16:42:29 -07:00
Henrik Holmboe
1f3ba9ced5 Add possible values to arguments in Salt man-page 2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2 Typo jod -> job 2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837 Choose vs chose typo 2014-11-03 20:54:39 +01:00
Erik Johnson
dfc10ef9b6 Update RC version in docs sidebar 2014-10-31 19:34:03 -06:00
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward 
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
 2014-10-30 17:42:36 -06:00
Thomas S Hatch
3f58d716a2 Merge pull request #16878 from plastikos/improvement-filter_by 
Improve filter_by() base argument:
 2014-10-30 10:02:32 -06:00
Hung Nguyen Viet
7423369c55 use 2 spaces only 2014-10-30 11:53:18 +07:00
Seth House
53dae1b3e4 Merge pull request #17019 from whiteinge/doc-salt-api-2014.7-release-notes 
Added the salt-api merge and recent additions to 2014.7 release notes
 2014-10-29 18:16:16 -05:00
Seth House
36ca21de0c Added the salt-api merge and recent additions to 2014.7 release notes 2014-10-29 18:15:03 -05:00
Nicole Thomas
500afb29fe Merge pull request #16962 from jacksontj/2014.7 
2014.7
 2014-10-29 16:19:03 -06:00
Seth House
aff7ab3f43 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-29 16:47:23 -05:00
Seth House
9da07584e4 Added missing docs for the /key rest_cherrypy entry point 
Should have been part of #16706.
 2014-10-29 16:35:04 -05:00
vs
7d84f116e3 fix formatting 2014-10-29 14:37:18 +01:00
vs
4beb56bdbb add wheel.minions to wheel-index 2014-10-29 14:35:13 +01:00
vs
9e63712488 add documentation for wheel.minions 2014-10-29 14:18:23 +01:00
Henrik Holmboe
3f669c4b5d Update index.rst 2014-10-28 18:36:19 +01:00
Thomas Jackson
9f7dac0674 Spelling fixes for docs 2014-10-28 08:12:27 -07:00
Seth House
c258d7d75f Highlight our remote training offerings 2014-10-28 08:42:08 -05:00
Mike Place
b3920023e7 Merge pull request #16943 from hulu/retreived-sic 
fix typos: retreived [sic]
 2014-10-27 19:12:57 -06:00
Chris Rebert
d37690e156 fix typos: retreived [sic] 2014-10-27 16:13:46 -07:00
Colton Myers
945e6506b6 Merge branch '2014.7' into develop 2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805 Fix pre-required vs pre-requiring mixups in prereq doc 2014-10-27 10:59:07 -06:00
nerdling
4d02c8da81 Update doc/topics/installation/osx.rst 
Unify instructions across package managers.
 2014-10-26 16:20:13 -04:00
Erik Johnson
142bac1522 Update release candidate number in docs sidebar 2014-10-25 17:56:28 -05:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
Henrik Holmboe
0e772aefe7 Update conf.py as well 2014-10-24 16:27:37 -06:00
Henrik Holmboe
1fc008bf25 Point to the correct latest 2014.1.13 release 
This is recurring and #12720 is tracking the issue.

Conflicts:
	doc/topics/releases/index.rst
 2014-10-24 16:27:11 -06:00
rallytime
617d777fa9 Release notes for 2014.1.13 2014-10-24 16:22:53 -06:00
Erik Johnson
d1e867c718 Remove known issue comment for salt-ssh 2014-10-24 16:16:33 -05:00
Erik Johnson
706f53941b Add notice on automatic installation of repoquery 2014-10-24 16:15:48 -05:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument: 
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
 2014-10-24 11:13:47 -06:00
rallytime
b90ba8cf4e Added updates to 2014.7.0 release notes 2014-10-24 09:29:13 -06:00
Thomas S Hatch
e9b29ea3e6 Redirect tot he correct page 2014-10-23 18:24:32 -06:00
Thomas S Hatch
910991a468 update raet intro 2014-10-23 18:15:24 -06:00
Thomas S Hatch
37d90fc633 Merge pull request #16853 from cachedout/issue_14906 
Add master_alive_interval to config and docs
 2014-10-23 15:14:44 -06:00
Thomas S Hatch
053adb76fc Merge pull request #16833 from janek-warchol/patch-1 
Fix external link formatting in glossary
 2014-10-23 14:11:24 -06:00
Thomas S Hatch
77a795bd07 Merge pull request #16844 from fictivekin/fix-releasecandidate-doc-version 
change Release Candidate installation doc from rc3 to rc4
 2014-10-23 14:10:29 -06:00
Thomas S Hatch
6f2a3c745b Merge pull request #16838 from felskrone/optional_sreq_caching 
Optional sreq caching in ZeroMQ-transport
 2014-10-23 14:07:30 -06:00
Thomas S Hatch
ed12f4c984 Merge pull request #16805 from thatch45/agg_doc 
fix docs for mod_aggregate per #16575
 2014-10-23 13:46:33 -06:00
Thomas S Hatch
1638e58245 Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master 
Conflicts:
	doc/topics/cloud/aws.rst
 2014-10-23 13:29:24 -06:00