Commit Graph

68097 Commits

Author SHA1 Message Date
Thomas S Hatch
790384f413 Merge pull request #34010 from terminalmage/issue33831
Do not cache remote files if they are already cached
2016-06-16 15:03:47 -06:00
Thomas S Hatch
dd26d6fd74 Merge pull request #34009 from rallytime/bp-33948
Back-port #33948 to 2016.3 + add log message
2016-06-16 15:01:09 -06:00
Thomas S Hatch
5f4ef46d2f Merge pull request #33941 from cachedout/issue_33927
Don't call os.getppid() on Windows
2016-06-16 14:56:17 -06:00
jacobhammons
fa253aa62b Merge pull request #34067 from jacobhammons/mobile-fix
Fixes doc refresh bug on chrome mobile.
2016-06-16 12:44:12 -06:00
Jacob Hammons
ce027fd769 Fixes doc refresh bug on chrome mobile. 2016-06-16 12:43:33 -06:00
Nicole Thomas
a20b25c79b Back-port #34026 to 2016.3 (#34050)
* removed method that doesn't work

* added logic for method removed in recent version
2016-06-15 19:31:12 -04:00
Thomas S Hatch
73ff11585e Merge pull request #33987 from isbm/isbm-inspectlib-cleanup
inspectlib cleanup
2016-06-15 16:09:31 -06:00
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
Erik Johnson
636d081ae0 Do not cache remote files if they are already cached
Unless the source_hash does not match, this will keep remote files from
being re-downloaded if they have already been cached.

Resolves #33831.
2016-06-14 13:34:28 -05:00
rallytime
239af9ae5e Warn when custom returners don't have minions kwarg in save_load 2016-06-14 11:54:46 -06:00
rallytime
c776d2d795 Add note to release notes about returner minions kwarg change 2016-06-14 10:33:41 -06:00
Mike Place
5f696082e3 Fix loop over cache in auth checking! 2016-06-14 10:30:59 -06:00
Mike Place
180c312715 Save an entire minion cache traversal on each master pub
We were doing an extra and unecessary full traversal of the minion
cache. This refactors all returners and the master to reduce this
to a single call. More work will be forthcoming to reduce this even
further, especially in the context of auth lookups.
2016-06-14 10:30:59 -06:00
Bo Maryniuk
e36821510f Fix documentation: add an example how to export system to the Kiwi 2016-06-14 09:40:51 +02:00
Bo Maryniuk
fe300ccf73 Lintfix 2016-06-14 09:39:04 +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
Bo Maryniuk
96423076b1 Add unit test for file tree 2016-06-14 00:25:08 +02:00
Bo Maryniuk
8975036b27 Add get_unmanaged_files test 2016-06-14 00:05:34 +02: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
Bo Maryniuk
be5f12fcaf Add initial unit test for inspectlib.collector.Inspector 2016-06-13 18:17:28 +02: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
Bo Maryniuk
652c96d7e7 Stop build (not implemented yet) 2016-06-13 17:09:16 +02:00
Bo Maryniuk
58e85ea0ab Refactor class caller 2016-06-13 17:07:42 +02: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
Bo Maryniuk
878f67674a Sort package names 2016-06-11 15:19:24 +02:00
Bo Maryniuk
c31818b4aa Fix lint: PEP8 multiplication of 4. 2016-06-11 15:08:11 +02:00
Bo Maryniuk
c87fff3680 Add root-only warning when exporting system with Kiwi 2016-06-11 15:06:38 +02:00