valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,160 Commits 24 Branches 182 Tags 341 MiB
b061b86946
Commit Graph

68160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
b061b86946 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-20 17:22:07 -06:00
Mike Place
65fba5b4d7 Merge pull request #34142 from isbm/isbm-getid-loglevel-shift 
Move log message from INFO to DEBUG.
 2016-06-20 11:57:34 -07:00
Bo Maryniuk
236a67b702 Move log message from INFO to DEBUG. 2016-06-20 17:53:59 +02:00
Erik Johnson
79a719b719 Update documentation on "refresh" behavior in pkg states (#34100) 2016-06-17 18:42:35 -04:00
Erik Johnson
6f03d06cc7 Restore old refresh logic (#34098) 
This was erroneously changed in aa29744, causing a refresh to not be
performed when refresh is set to None (or not passed to
pkg.latest/pkg.installed states).
 2016-06-17 18:41:59 -04:00
Bruno Binet
92dc7936ca Encourage to report issues to upstream PillarStack project (#34087) 2016-06-17 11:41:10 -04:00
Thomas S Hatch
9da592a297 Merge pull request #34075 from jfindlay/import_xml 
modules.inspectlib.kiwiproc: import gate lxml
 2016-06-17 09:36:08 -06:00
Justin Findlay
6d0d52fa86 modules.pkg int tests: skip refresh_db upon error (#34072) 2016-06-17 09:35:47 -06:00
Thomas S Hatch
52b852216a Merge pull request #34056 from vutny/rpmbuild-support-debian 
Make rpmbuild module work on non-RPM based GNU/Linux systems
 2016-06-17 09:14:51 -06:00
Denys Havrysh
8ff36d4f2b Expose virtual pkgbuild module as rpmbuild on non-RPM based systems 
if all required utilities are in place
 2016-06-17 12:07:48 +03:00
Nicole Thomas
f2a2c2bf53 Merge pull request #34073 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-16 19:02:31 -04:00
Justin Findlay
f882a72348 modules.inspectlib.kiwiproc: import gate lxml 2016-06-16 16:23:36 -06:00
rallytime
f6bfaede21 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/installation/index.rst
  - salt/master.py
  - salt/modules/mac_brew.py
  - salt/modules/pacman.py
  - salt/modules/solarisips.py
  - salt/returners/postgres_local_cache.py
  - salt/states/apache_module.py
  - salt/utils/minions.py
  - tests/unit/acl/client_test.py
 2016-06-16 16:10:41 -06:00
Thomas S Hatch
1b76de1557 Merge pull request #34069 from rallytime/test-minion-return-message 
Add a test to check for disconnected minion messaging
 2016-06-16 15:18:38 -06:00
Thomas S Hatch
3119693dac Merge pull request #34048 from terminalmage/issue30100 
RFC: proposed fix for multiple fileserver updates in masterless runs
 2016-06-16 15:10:59 -06:00
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
rallytime
60561ac6fc Add a test to check for disconnected minion messaging 2016-06-16 14:07:05 -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
Thomas S Hatch
dd03024931 Merge pull request #34011 from rallytime/bp-33948-2015.8 
Back-port #33948 and #34009 to 2015.8
 2016-06-16 09:41:01 -06:00
Tim Egbert
bca437128e Fixed a bug in the consul.py module that was preventing services (#34051) 
from registering in consul.agent_service_register. A nonexistent
dict key was being referenced, causing an Excpetion and failure to
register the service. This fix required only changing the offending
line to use the "get" method and supplying a default value.
 2016-06-16 11:20:41 -04:00
Denys Havrysh
758f5cd77c Make rpmbuild module work on Debian GNU/Linux and derivatives 2016-06-16 10:35:35 +03: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
Erik Johnson
715e7af8a4 Ensure only one fileserver update in a masterless run 
Resolves #30100.
 2016-06-15 14:49:27 -05: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
8ba117c7f6 Merge pull request #34045 from jacobhammons/release-prev 
Updated latest release version
 2016-06-15 13:22:42 -06:00
Jacob Hammons
43b4a12aa2 Updated latest release version 2016-06-15 13:22:06 -06: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
f9bfcde61f Always make changes to minion config if set (#34020) 2016-06-15 12:53:53 -04:00
Shane Lee
e4a7190a1d Always make chanes to minion config if set (#34021) 2016-06-15 12:53:42 -04:00
Denys Havrysh
e25dba49e2 More YAML indentation fixes in state module examples (#34030) 
* states.file: fix indentation in YAML examples

* More YAML indentation fixes
 2016-06-15 12:40:12 -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
Nicole Thomas
5b5eae4ca9 Merge pull request #34018 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-14 18:53:19 -04:00
rallytime
77f44f3087 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - tests/integration/output/output.py
 2016-06-14 15:47:35 -06:00
rallytime
a4660d1ff7 Warn when custom returners don't have minions kwarg in save_load 2016-06-14 12:54:22 -06:00
rallytime
78befde62f Add note to release notes about returner minions kwarg change 2016-06-14 12:51:44 -06:00
Mike Place
4e7f35fa36 Fix loop over cache in auth checking! 2016-06-14 12:49:43 -06:00
Mike Place
06963e0505 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 12:44:56 -06: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