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
46,082 Commits 24 Branches 182 Tags 341 MiB
6066e3f533
Commit Graph

3956 Commits

Author SHA1 Message Date
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -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
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
 2015-01-26 19:44:59 -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
bfc6ead3b0 Merge pull request #20039 from bechtoldt/doc_various_fixes 
completing some doc references
 2015-01-26 12:15:38 -07:00
Thomas S Hatch
5cc9a7c249 Merge pull request #20037 from bechtoldt/fix_19262 
add missing file_tree and virtkey in pillar index doc, refs #19262
 2015-01-26 12:15:02 -07:00
Colton Myers
a17c3716bd Merge remote-tracking branch 'upstream/2015.2' into develop 2015-01-26 10:16:37 -07:00
Thomas S Hatch
828906d62d Merge branch '2015.2' into beacons 2015-01-25 09:26:43 -07:00
Arnold Bechtoldt
439f253998 adding runners to doc salt.runners reference 2015-01-24 22:46:06 +01:00
Arnold Bechtoldt
4e72fdedb2 adding returners to doc salt.returners reference 2015-01-24 22:44:03 +01:00
Arnold Bechtoldt
2ad37d0bca adding renderers to doc salt.renderers reference 2015-01-24 22:41:54 +01:00
Arnold Bechtoldt
020ca989a3 adding output to doc salt.output reference 2015-01-24 22:38:28 +01:00
Arnold Bechtoldt
eeeff3b393 adding states to doc salt.states reference 2015-01-24 22:35:23 +01:00
Arnold Bechtoldt
7724073588 adding modules to doc salt.modules reference 2015-01-24 22:30:52 +01:00
Arnold Bechtoldt
73cbbf0e5f those files seem to be required, too 2015-01-24 21:51:45 +01:00
Arnold Bechtoldt
0ab5f51529 add missing file_tree and virtkey in pillar index doc, refs #19262 2015-01-24 21:43:32 +01: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
8bba4bbec4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/msazure.py
	salt/modules/boto_sns.py
	salt/states/boto_sns.py
	tests/integration/modules/boto_sns.py
	tests/integration/states/boto_sns.py
 2015-01-23 14:20:34 -07:00
Thomas S Hatch
2e48f6a4ec Merge pull request #19967 from alxbse/win_repo_multiple_sources 
multiple source files in windows repo to fix saltstack/salt#9028
 2015-01-22 20:04:58 -07:00
jasonm-makerbot
64e816280a Update index.rst 
Correcting ordering of arguments, original way throws an error
 2015-01-22 19:16:44 -05: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
Alexander Backlund
e5c59deab3 added support for multiple source files in windows repo to fix saltstack/salt#9028 2015-01-22 11:55:33 -08: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
9446633e9d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-21 12:05:51 -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
Joseph Hall
27adbbe8aa Revert "Allow joyent api host suffix to be configurable" 2015-01-21 08:05:45 -07:00