valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,176 Commits 24 Branches 182 Tags 341 MiB
1be05f6a87
Commit Graph

68176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
1be05f6a87 Update saltutil.wheel docs to specify remote vs local minion behavior 
Fixes #33879
 2016-06-22 11:44:46 -06:00
Mike Place
3413c494bd Merge pull request #34173 from rallytime/fix-34162 
Update docs to match log_level default
 2016-06-21 10:15:53 -07:00
Mike Place
c596bf5744 Merge pull request #34095 from rallytime/bp-32396 
Back-port #32396 to 2016.3
 2016-06-21 09:12:39 -07:00
Mike Place
b98687875f Merge pull request #34108 from l2ol33rt/docker_absent_dryrun 
Make dockerng.absent state honor test=true
 2016-06-21 08:55:28 -07:00
Mike Place
a75386a669 Merge pull request #34133 from rallytime/bp-34057 
Back-port #34057 to 2016.3
 2016-06-21 08:53:46 -07:00
Mike Place
dd989dac78 Merge pull request #34156 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-21 08:52:58 -07:00
Mike Place
b302cb03ef Merge pull request #34110 from garethgreenaway/git_needs_saltenv_for_identity 
Fixes to git module & state module related to identity file
 2016-06-21 08:52:17 -07:00
Mike Place
6c3405755a Merge pull request #34138 from rallytime/fix-34120 
Update package dep note to systemd-python for RHEL7 install
 2016-06-21 08:51:24 -07:00
rallytime
f577681f0b Update docs to match log_level warning default 
Fixes #34162
 2016-06-21 09:31:59 -06:00
Denys Havrysh
55c22080df Fix YAML indentation in Apache state docstrings (#34166) 2016-06-21 11:03:06 -04:00
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
rallytime
73f3e12ce6 Update package dep note to systemd-python for RHEL7 install 
Fixes #34120
 2016-06-20 08:53:42 -06:00
Antoine Jacoutot
f7be5e182b _active_mounts_openbsd: unbreak output for special filesystems 
mount(8) output is a little bit different on OpenBSD between local and special
or remote filesystems (e.g. tmpfs or nfs). These do not use a UUID nor a device.

https://github.com/saltstack/salt/issues/34012
 2016-06-20 08:06:41 -06:00
Robert James Hernandez
5598cb4a21 Make docker.absent honor test=true 2016-06-17 17:42:25 -07:00
Gareth J. Greenaway
68092cdc8c When specifying the SSH identity to use with Git as a salt URL, eg. salt://files/identity, if that file exists outside of the default base environment the file won't be accessible so we need to include the saltenv. 2016-06-17 16:32:05 -07: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
Eric Radman
074b6ab5c2 Correct pylint error 2016-06-17 12:55:58 -06:00
Eric Radman
20ff5c879a Unbreak cron.file 
An extra argument (skip_verify) was recently added to get_managed(),
resulting in this error:

  Unable to manage file: get_managed() takes exactly 11 arguments (10 given)

Also eliminate a variable that can remain uninitialized when running
`salt-call`
 2016-06-17 12:55:58 -06: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