valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
41,277 Commits 24 Branches 182 Tags 341 MiB
de67c5be35
Commit Graph

3680 Commits

Author SHA1 Message Date
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
C. R. Oldham
79d2de5d44 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-11-10 16:33:50 -07:00
C. R. Oldham
25f7bf111a Add breaking change notice for module.run in 2014.1.0 2014-11-10 16:28:21 -07:00
Colton Myers
257b3d4426 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/utils/__init__.py
	salt/utils/minions.py
 2014-11-10 14:08:49 -07:00
Mike Place
1fd9983fc7 Merge pull request #17310 from rallytime/update_windows_pkg_doc 
Add 2014.7.0 release to windows installation doc
 2014-11-10 12:33:00 -07:00
Colton Myers
9841103427 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/rabbitmq.py
	salt/states/rabbitmq_cluster.py
 2014-11-10 09:59:17 -07:00
Colton Myers
69fa6b2e3c Fix the release notes note 2014-11-10 09:51:21 -07:00
Thomas S Hatch
8862c2e829 Merge pull request #17290 from plastikos/improvement-yaml_encode 
Add yaml_encode() jinja filter
 2014-11-10 09:35:39 -07:00
Thayne Harbaugh
e4488a3956 Add yaml_encode() jinja filter 
* Add documentation for yaml_encode()
  * Mention yaml_encode() in formulas documentation
  * Add unit tests for yaml_encode()
  * Improve unit tests and documentation for related yaml_dquote()
 2014-11-07 19:12:58 -07:00
rallytime
4cbeebd3d0 Add 2014.7.0 release to windows installation doc 2014-11-07 15:26:28 -07:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
rallytime
2396392449 Remove release candidate message from docs sidebar 2014-11-07 09:37:09 -07:00
Thomas S Hatch
e9cda43070 Merge pull request #17240 from mgwilliams/ext_processes 
Ext processes
 2014-11-06 16:46:15 -07:00
Matthew Williams
b753db48b0 add docs for ext_processes 2014-11-06 23:32:36 +00:00
Thomas S Hatch
01b917fcf6 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/states/rabbitmq_cluster.py
 2014-11-06 15:04:40 -07:00
Thomas S Hatch
124fbba226 Merge pull request #17216 from rallytime/update_windows_links 
Update windows installer links to include 2014.1.13 pkgs
 2014-11-06 14:33:55 -07:00
Ignacio Torres Masdeu
5977ac4abf Explicitly explain homebrew's stance on sudo 2014-11-06 16:37:38 +01:00
Ignacio Torres Masdeu
6c8ad36c96 Homebrew explicitly discourages the use of sudo 
https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/FAQ.md#sudo
 2014-11-06 16:10:32 +01:00
rallytime
6f10b96f01 Update windows installer links to include 2014.1.13 pkgs 2014-11-05 16:15:07 -07:00
Sandra Kosmalla
2096f2cafd fix syntax error in writing grains code snippet 2014-11-05 15:13:51 -07:00
Dylan Fitzgerald
611baf468a Correct data in /srv/reactor/startup_highstate.sls 
data['id'] does not exist; data['name'] does. revise example sls to render correctly.
 2014-11-05 13:23:43 -07:00
Colton Myers
cf45d1051d Merge branch '2014.7' into develop 2014-11-05 11:28:20 -07:00
Colton Myers
4149716bf2 Add note to release notes about pillar/compound matching in mine/publish 2014-11-05 11:27:23 -07:00
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