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
68,062 Commits 24 Branches 182 Tags 341 MiB
13b660cdf7
Commit Graph

68062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorge Schrauwen
13b660cdf7 fix #34038 (#34042) 2016-06-15 15:42:19 -04:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
jacobhammons
3035520594 Merge pull request #34044 from jacobhammons/3.1 
Updated latest release to 2016.3.1
 2016-06-15 13:20:28 -06:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1 
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
 2016-06-15 11:52:02 -06:00
Jared McKnight
f598f96ffe fix launch config creation params (#34014) 2016-06-15 12:56:59 -04:00
Shane Lee
e4a7190a1d Always make chanes to minion config if set (#34021) 2016-06-15 12:53:42 -04:00
Nicole Thomas
5f90717fd3 Merge pull request #34031 from eliasp/2016.3-salt.states.postgres_privileges-doc-priv-list 
`states.postgres_privileges` expects a real list, not a comma-separated string
 2016-06-15 12:34:04 -04:00
Elias Probst
d3198ea538
states.postgres_privileges expects a real list, not a comma-separated string for privileges 2016-06-15 13:38:56 +02:00
Mike Place
1132bc5d0b Merge pull request #33995 from jacobhammons/doc-fixes 
Understanding Jinja topic, Jinja doc issues.
 2016-06-13 19:00:29 -07:00
Mike Place
a400f6a6c3 Merge pull request #33900 from amendlik/gitfs-hook-doc 
Document sudo policy for gitfs post-recieve hook
 2016-06-13 18:04:35 -07:00
Mike Place
28c886edd0 Merge pull request #33980 from twangboy/fix_build 
Use full path to python.exe
 2016-06-13 17:46:14 -07:00
Mike Place
26fee377ec Merge pull request #33993 from s0undt3ch/2016.3 
Call `sys.exit()` instead of `exit()`
 2016-06-13 17:30:46 -07:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues. 
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
 2016-06-13 18:30:42 -06:00
Pedro Algarvio
34f7d90d9f
Call sys.exit() instead of exit() 2016-06-14 00:34:38 +01:00
Nicole Thomas
2e934cffef Merge pull request #33976 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-13 15:29:40 -04:00
Adam Mendlik
b4a28e2684 Add clarifying documentation about the need for sudo in the git hook 2016-06-13 13:22:39 -06:00
twangboy
dd7d55afb9 Use full path to python.exe 2016-06-13 12:01:15 -06:00
Mike Place
8d8ed59b85 Merge pull request #33912 from abalashov/abalashov/fix-schedule-returner-config 
utils/schedule.py:handle_func() - Fix for accessing returner configur…
 2016-06-13 10:18:04 -07:00
rallytime
19d49d94f2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-13 11:13:38 -06:00
Mike Place
a74f1b8077 ZD 762 (#33942) 
* Initial debugging

* Replace the old child jid tracking with psutil investigation of children

* Remove debugging
 2016-06-13 12:43:18 -04:00
Mike Place
0281d491c6 Merge pull request #33946 from rallytime/bp-33698 
Back-port #33698 to 2015.8
 2016-06-13 08:55:22 -07:00
Mike Place
dff3f51955 Merge pull request #33952 from rallytime/fix-33911 
Add base argument to salt-ssh grains wrapper for filter_by func
 2016-06-13 08:51:33 -07:00
Nicole Thomas
81e16bb93f Merge pull request #33945 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-13 11:44:30 -04:00
Mike Place
68d261fe5b Merge pull request #33960 from mecarus/2016.3 
Fix mongo get_load to return full mongo record instead of non-existant 'load' key
 2016-06-13 08:37:46 -07:00
jacobhammons
4a8064918a Adds a "Generated on <timestamp>" line to the footer of each doc html page in the doc (#33962) 2016-06-13 11:24:40 -04:00
jacobhammons
8f56406507 Merge pull request #33961 from jacobhammons/release 
2016.3.0 known issues update
 2016-06-12 20:59:21 -06:00
Jacob Hammons
2cf787d4ba 2016.3.0 known issues update 2016-06-12 20:58:21 -06:00
rforkosh
d622133a49 The jid load comes in directly, not as 'load' key. Should return the mongo record directly without accessing keys 2016-06-12 18:01:22 -05:00
rallytime
03b7cbbd2c Add base argument to salt-ssh grains wrapper for filter_by func 
Fixes #33911
 2016-06-10 16:34:31 -06:00
Daniel Hobley
5fdfed1cb9 Make sure we only use GetConnection if we are using a proxy salt minion 2016-06-10 14:16:20 -06:00
Daniel Hobley
1505c5724b Fix a bug with self signed certificates and creating a new VM 
- Removed the GetConnection call as all this does is cause connections that are connected with the overrides for "CERTIFICATE_VERIFY_FAILED" to not be able to connect the 2nd time the si is fetched
 2016-06-10 14:16:14 -06:00
rallytime
b4ab322ce1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/saltutil.py
 2016-06-10 13:41:53 -06:00
Nicolas Delaby
f806c7e290 [boto_lambda] handle ommitted Permissions parameter (#33908) 
* a bit of pep8

* Don't fail if `Permssions` is None
 2016-06-10 13:31:22 -04:00
Mike Place
b3ec39d644 Correct issue with ping on rotate with minion cache (#33765) 
Only check connected minions if we have the data to do so. Closes #29525
 2016-06-10 13:17:08 -04:00
Mike Place
378dd7ca06 Merge pull request #33888 from jfindlay/random_check 
random.org checks
 2016-06-10 08:45:07 -07:00
Mike Place
16b5e9dcc1 Merge pull request #33896 from DSRCompany/issues/33575_do_not_deep_copy_context 
Don't deep copy context dict values.
 2016-06-10 08:32:54 -07:00
Nicole Thomas
2dc1914e7c Add connecting_settings to boto_elb state attributes list (#33936) 
Refs #31499
 2016-06-10 11:28:11 -04:00
Mike Place
01323322b0 Merge pull request #33905 from rallytime/bp-33847 
Back-port #33847 to 2016.3
 2016-06-10 08:22:34 -07:00
Joseph Hall
91a2184f2d Wait for up to a minute for sync_after_install (#33917) 2016-06-10 11:14:59 -04:00
Mike Place
261baeb5b5 Ensure tht pillar have freshest grains (#33910) 2016-06-09 14:13:10 -04:00
Alex Balashov
b5a4f8b313 utils/schedule.py:handle_func() - Fix for accessing returner configuration attributes 'return_config' and 'return_kwargs'. 
They are specified as 'return_config' and 'return_kwargs' in the documentation, and those are the member names used elsewhere in the code base. However, this code previously referenced 'returner_kwargs' and 'returner_config', so returners from scheduled jobs were not appropriately called in situations in which configuration parameters to override default minion config needed to be provided to the schedule module.

Resolves issue #33868 (https://github.com/saltstack/salt/issues/33868).
 2016-06-09 14:05:36 -04:00
Seth House
b6ebd7b6ef Add docs for arg/kwarg eauth matching 
This adds documentation for the addition in #29153.
 2016-06-09 09:13:02 -06:00
Nicole Thomas
00e016ecfc Add note about Xenial packages to 2016.3.0 release notes (#33870) 
Refs #32761
 2016-06-09 10:52:16 -04:00
Nicole Thomas
ef6da0be5d Merge pull request #33877 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-09 10:50:42 -04:00
Adam Mendlik
1046279cb7 Document sudo policy for gitfs post-recieve hook 
Because the hook is run as the user performing the push,
salt-call will typically fail. This documentation change
uses sudo for salt-call, and provides a sudo policy that
permits any user to run the post-recieve hook.
 2016-06-09 07:10:12 -06:00
Dmitry Kuzmenko
8e34d0a9c3 Don't deep copy context dict values. 2016-06-09 11:49:18 +03:00
Justin Findlay
6acee3cc30 modules.random_org._query: only return text if present 2016-06-08 20:47:39 -06:00
Justin Findlay
82f95429db modules.random_org unit tests: skip if random.org down 2016-06-08 20:46:20 -06:00
Justin Findlay
1f9422e0cd utils.http.query: also except gaierror with tornado 2016-06-08 20:46:20 -06:00
Justin Findlay
06f249901a add 2016.3.1 release notes (#33883) 2016-06-08 16:49:28 -06:00