valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,139 Commits 24 Branches 182 Tags 341 MiB
832df20df2
Commit Graph

3910 Commits

Author SHA1 Message Date
Erik Johnson
832df20df2 Complete initial draft of LXC tutorial 
This will need to be filled out, but this is a good starting point.
 2015-02-10 15:06:45 -06:00
Erik Johnson
c4fc5f5fa4 More info for LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
2dad71adc9 Add more info to LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -06:00
Erik Johnson
196a7d6327 Stub for LXC tutorial 2015-02-10 15:06:43 -06:00
Colton Myers
eba17606b4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48 Add file-locking bugfix to 2014.7.2 release notes 2015-02-09 11:32:20 -06:00
Seth House
9a1a2db3aa Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-06 19:52:23 -07:00
Seth House
bf6dfe823e Remove Mako from mocked deps for docs build 
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.

Closes #9571 (at long last).
 2015-02-06 19:00:35 -07:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
Seth House
15936658ba Added cross-references to other ways to preseed minion keys 2015-02-05 19:15:46 -07:00
Justin Findlay
a44368001b fix pip venv regression, deprecate activate param 
Fixes #20191.  If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv.  Also
update associated unit test.
 2015-02-05 12:36:42 -07:00
Justin Findlay
b87615e277 document lowercase removal change 2015-02-03 16:27:41 -07:00
Colton Myers
ca6ecc0f0f Add only_upgrade to 2015.2 release notes 2015-01-30 16:07:39 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Joseph Hall
f5e8b4a10e Don't default CA bundle updates to a non-standard location 2015-01-28 20:09:13 -07:00
Thomas S Hatch
97285aadd0 Merge pull request #20152 from techhat/httpupdate 
Add function to update CA cert bundle
 2015-01-28 15:03:55 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00
Seth House
e3d29bf8ff Fixed syntax error in log_granular_levels example 2015-01-27 20:14:53 -07:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -07:00
rallytime
80bfa4a2a6 Add beacons section to 2015.2.0 release notes 2015-01-26 20:26:51 -07:00
Seth House
8e476bc455 Fixed typos in the beacon docs 2015-01-26 18:20:54 -07:00
Seth House
b777d3cba1 Added unique identifier for the beacon docs 2015-01-26 18:19:34 -07:00
Seth House
a26aef0d7d Added beacon module docs to the module index 2015-01-26 18:19:34 -07:00
Seth House
127ddb6d9c Added cross-references to the inotify beacon module 2015-01-26 18:19:34 -07:00
Thomas S Hatch
5affea1022 Merge branch '2015.2' into beacons 2015-01-26 16:57:43 -07:00
Shane D Lee
7c253f5ede Changed exe's to installers 2015-01-26 15:48:03 -07:00
Thomas S Hatch
828906d62d Merge branch '2015.2' into beacons 2015-01-25 09:26:43 -07:00
Thomas S Hatch
54529a9aa2 Add initial documentation 2015-01-23 23:11:34 -07:00
Pedro Algarvio
cdbbe4c0dd Fix typos 2015-01-24 03:16:52 +00:00
Mike Place
b8e9249c80 Added docs for Lithium deprecations 2015-01-24 03:16:49 +00:00
Colton Myers
9e9a2eab90 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/loader.py
 2015-01-23 16:13:30 -07:00
Thomas S Hatch
55cb7fdab1 Merge pull request #20015 from basepi/grainsprecedencedocs19611 
Fix grains precedence issues
 2015-01-23 15:40:32 -07:00
Colton Myers
f609366dee Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
 2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973 Release 2014.7.1 (docs sidebar and release date for release notes) 2015-01-22 16:52:21 -07:00
Colton Myers
079e20a536 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-22 16:48:27 -07:00
Colton Myers
63195007d6 Merge pull request #19980 from rallytime/update_windows_release_docs 
Add 2014.7.1 release to Windows Installation Docs
 2015-01-22 16:48:15 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
robert.fach
4f7b0a29d1 updated information regarding required version for dulwich gitfs backend 2015-01-22 17:14:27 +01:00
Colton Myers
a067e6ceba Fix the grains precedence documentation 
Fixes #19611
 2015-01-21 16:10:18 -07:00
Colton Myers
098c39596a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/templates/rh_ip/rh5_eth.jinja
	salt/templates/rh_ip/rh6_eth.jinja
	salt/utils/templates.py
 2015-01-21 11:19:06 -07:00
Thomas S Hatch
678c57f414 Merge pull request #19907 from techhat/httpdocs 
Update HTTP tutorial for new functionality
 2015-01-21 10:41:34 -07:00
Joseph Hall
483e84c78a Update HTTP tutorial for new functionality 2015-01-21 09:20:11 -07:00
Joseph Hall
667473c72c Modify how joyent driver handles SSL and URLs 2015-01-21 08:29:06 -07:00
Thomas S Hatch
602b1a34aa Merge pull request #19862 from kev009/freebsd-kmods 
Add freebsdkmod changes to 2014.7.2 relnotes
 2015-01-20 16:06:17 -07:00
Colton Myers
88fb2e0036 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/tutorials/starting_states.rst
	salt/modules/linux_lvm.py
 2015-01-20 15:19:53 -07:00
Colton Myers
1fb6fc0ba1 Fix the explanation of the Default Data - YAML section of starting states 2015-01-20 15:03:54 -07:00
rallytime
99e35ffb1e Add 2014.7.1 release to Windows Installation Docs 
Also remove the links to the 2014.7.0 exe's because of regressions.
 2015-01-20 12:21:57 -07:00
Kevin Bowling
494543c5bc Add freebsdkmod changes to 2014.7.2 relnotes 2015-01-20 02:09:32 -07:00