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
59,254 Commits 24 Branches 182 Tags 341 MiB
fc36164ddf
Commit Graph

59254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Hammons
69d64f177d moved rhel5 commands to separate lines 2015-09-15 06:30:45 -06:00
Jacob Hammons
90431278ea Install instruction updates for rhel6 and debian 2015-09-15 06:29:09 -06:00
Eren Güven
ec2d68a84a don't show diff for test run if show_diff=False 2015-09-15 12:43:44 +02:00
Justin Findlay
fc8afcc9f9 Merge pull request #27124 from jfindlay/bp-27123 
Backport #27123
 2015-09-15 02:37:43 -06:00
Justin Findlay
d4533d0656 Merge pull request #27126 from jfindlay/macgroup 
Merge #27009
 2015-09-15 01:41:45 -06:00
Justin Findlay
d12ebf84de single quote string in mac_group exec mod 2015-09-15 01:39:54 -06:00
Justin Findlay
c186e51764 Merge pull request #27117 from jacobhammons/release-docs-2014.7 
made 2014.7 an archived release
 2015-09-15 01:35:12 -06:00
Justin Findlay
088b1dbb3e Merge pull request #27116 from jacobhammons/release-docs-2015.5 
Update latest to 2015.8, 2015.5 is now previous
 2015-09-15 01:34:27 -06:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne 
Merge #27019
 2015-09-15 01:32:17 -06:00
Justin Findlay
69d758ee2b Merge pull request #27114 from cachedout/warn_on_insecure_log 
Issue warning that some log levels may contain sensitive data
 2015-09-15 01:30:43 -06:00
Justin Findlay
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-15 01:29:30 -06:00
Christer Edwards
016fb5fafe Update freebsd.rst 
fix URL, typ in saltstack repo config
 2015-09-15 01:27:14 -06:00
Christer Edwards
026fc9a884 update for freebsd installation documentation 2015-09-15 01:27:14 -06:00
Justin Findlay
1ba188d0b3 Merge pull request #27123 from cedwards/freebsd_docs 
update for freebsd installation documentation
 2015-09-15 01:25:20 -06:00
Justin Findlay
886e7bc234 Merge pull request #27122 from terminalmage/fix-broken-link 
Fix broken link to git-config(1) docs
 2015-09-15 01:25:05 -06:00
Christer Edwards
d55f3f79cb Update freebsd.rst 
fix URL, typ in saltstack repo config
 2015-09-14 21:44:44 -06:00
Christer Edwards
ab53cd2970 update for freebsd installation documentation 2015-09-14 21:34:35 -06:00
Erik Johnson
0b212ea5b3 Fix broken link to git-config(1) docs 
Note that I am linking directly to the documentation for Git 2.5.1
because of a bug on git-scm.com, repored upstream as
https://github.com/git/git-scm.com/issues/591.
 2015-09-14 22:21:31 -05:00
Robert James Hernandez
46c7aee367 Boto dynamodb util should be using layer 2 abstractions 2015-09-14 17:16:00 -07:00
Colton Myers
ab519fb5ff Remove heavily-mocked unit tests 2015-09-14 17:00:02 -06:00
Jacob Hammons
b69e11e0a4 made 2014.7 an archived release 
minor doc site updates
 2015-09-14 16:43:51 -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
Colton Myers
551bbe70af Merge pull request #27115 from jacobhammons/release-docs 
Release docs
 2015-09-14 16:19:18 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Jacob Hammons
42eaa80997 Restored missing css 2015-09-14 16:00:06 -06:00
Jacob Hammons
9ab642295e Fixed a release notes typo and bad file rename 2015-09-14 15:51:37 -06:00
Mike Place
634264f443 Merge pull request #27112 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-14 15:50:08 -06:00
Mike Place
89c90df909 Merge pull request #27110 from rallytime/fix-11993 
Make sure -Q output is consistent across salt-cloud drivers
 2015-09-14 15:48:40 -06:00
rallytime
c1abc5a19f Remove implied Nones 2015-09-14 15:47:41 -06:00
Mike Place
507fb04683 Issue warning that some log levels may contain sensitive data 2015-09-14 15:39:17 -06:00
Jacob Hammons
daa3f4eee0 Updated release notes, change 2015.8 to latest release for doc site 2015-09-14 15:17:59 -06:00
Colton Myers
896313bff0 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/pillar/s3.py
 2015-09-14 15:01:41 -06:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
rallytime
5d7d357cdd digital_ocean list_nodes function should list public and private ips like other drivers 2015-09-14 14:45:13 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
rallytime
4b27aef406 Add 'name' to the output of salt-cloud -Q commands, where needed, for consistency. 2015-09-14 14:28:05 -06:00
Mike Place
66d8f51d31 Merge pull request #26929 from steverweber/keepalive 
Keepalive fixes
 2015-09-14 14:00:50 -06:00
Mike Place
1c7b3188bd Merge pull request #27104 from hexedpackets/develop 
Remove only the file extension when checking missing cached nodes.
 2015-09-14 13:56:59 -06:00
Mike Place
5bc3b968ad Merge pull request #27099 from plastikos/bug-fix_summary2 
Fix access to ret parameter of _print_returns_summary() (reverts 54b33dd359 #24732)
 2015-09-14 13:55:39 -06:00
Mike Place
a87a62c5b6 Merge pull request #26857 from bradthurber/add_jboss_domain_mode_to_jboss7_modules 
add jboss domain mode to jboss7 python modules
 2015-09-14 13:40:26 -06:00
Mike Place
e844d45e03 Merge pull request #26999 from skizunov/develop2 
Fix salt-master to run on Windows
 2015-09-14 13:32:14 -06:00
Mike Place
bdd6264398 Merge pull request #27101 from adelcast/dev/adelcast/add_network_settings_beacon 
Add beacon to monitor network settings
 2015-09-14 13:29:15 -06:00
Alejandro del Castillo
7cca5c987b Merge pull request #1 from cachedout/py3_network_settings 
Absolute import to satisfy Py3 compat
 2015-09-14 14:27:39 -05:00
Mike Place
9a62ad17fe Merge pull request #27106 from rallytime/versionadded-26855 
Versionadded for #26855
 2015-09-14 13:15:57 -06:00
Mike Place
ebeec62260 Merge pull request #27087 from rallytime/gpg-collapsible-ifs 
Collapse if statements in gpg module
 2015-09-14 13:15:37 -06:00
Mike Place
f0b41e4577 Merge pull request #26962 from ctrlrsf/state-verbose-flag 
Add --state-verbose command line option to salt cmd
 2015-09-14 13:13:26 -06:00
rallytime
c9837861c8 Versionadded for #26855 2015-09-14 13:12:45 -06:00
Mike Place
21daed7d6b Merge pull request #27090 from rallytime/user-collapsible-ifs 
Code Cleanup of salt/states/user.py
 2015-09-14 13:09:45 -06:00
Mike Place
17c7d957d2 Merge pull request #26855 from benburkert/postgres-default-password 
add the default_password argument to the postgres_user.present state
 2015-09-14 13:05:46 -06:00
Mike Place
b13b6b912a Merge pull request #26984 from tinyclues/26505_improve_content_type_support 
[NetAPI] SaltNado - Improve support for Content-Type parsing. Ref #26505
 2015-09-14 13:02:28 -06:00