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
69,773 Commits 24 Branches 182 Tags 341 MiB
0d7af935e5
Commit Graph

69773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loren Gordon
35f3bb3a8a Exposes ignore_if_missing to file.replace state module 
Fixes #36692
 2016-09-29 18:27:12 -04:00
C. R. Oldham
e8e53d60be pass __proxy__ in state.sls_id 2016-09-29 13:59:23 -06:00
C. R. Oldham
c089ac6c67 Merge pull request #36686 from jfindlay/log_levels 
log levels doc: try long form table
 2016-09-29 12:21:47 -06:00
Nicole Thomas
e0a851b2f1 Merge pull request #36690 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-29 11:46:24 -06:00
rallytime
7fc38c9aca Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-29 10:59:09 -06:00
Nicole Thomas
7d1972bd5c Merge pull request #36684 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-09-29 10:53:19 -06:00
Nicole Thomas
f95dd696e5 Merge pull request #36680 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-29 10:49:16 -06:00
Justin Findlay
4dd4fc94dc log levels doc: try long form table 
sphinx didn't render the shorthand table
 2016-09-29 10:11:06 -06:00
rallytime
838722d225 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-09-29 10:02:46 -06:00
Nicole Thomas
8f1ba2fa26 Merge pull request #36678 from rallytime/merge-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2016-09-29 09:44:56 -06:00
rallytime
3e4ac617d3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/integration/cli/grains.py
  - tests/integration/files/file/base/issue-2068-template-str-no-dot.sls
  - tests/integration/files/file/base/issue-2068-template-str.sls
  - tests/integration/modules/pip.py
 2016-09-29 09:15:26 -06:00
Denys Havrysh
bba9d0d105 alternatives.install state: detect alternatives command failed 2016-09-29 18:09:16 +03:00
rallytime
51240ecb13 Merge branch '2014.7' into '2015.5' 
Conflicts:
  - salt/modules/linux_lvm.py
 2016-09-29 09:02:34 -06:00
wucheng
48d2d512d8 fix bug for including loopback addr 
addrs.discard('127.0.0.1') already remove 127.0.0.1 out of addrs, and salt.utils.network.ip_addrs will ignore 127.0.0.1 by default, so the code of line 589 `if ipv4 in addrs` will not works forever, because 127.0.0.1 will never be in addrs.
 2016-09-29 17:39:10 +08:00
Mike Place
e4c5d0bfd6 Merge pull request #36664 from cachedout/remove_useless_size_check 
Remove possible race between grains dumps in test
 2016-09-29 15:36:27 +09:00
Mike Place
3d098c64ef
Remove possible race between grains dumps in test 
It's not always reasonable assume that grains will be the same byte-for-byte
between invocations. Remove that assumption since it isn't related to the what's under test here anyhow.
 2016-09-29 15:34:50 +09:00
Mike Place
8cfe371a5a Merge pull request #36663 from cachedout/skip_pip_tests_on_download_fail 
Fix error in pip test
 2016-09-29 15:15:52 +09:00
Mike Place
0c7fb91dc5
Fix error 2016-09-29 15:14:37 +09:00
Mike Place
e3f8618982 Merge pull request #36662 from cachedout/skip_pip_tests_on_download_fail 
Skip over tests where upstream pip isn't there
 2016-09-29 15:12:26 +09:00
Mike Place
0bbc60ccd7
Skip over tests where upstream pip isn't there 2016-09-29 15:11:38 +09:00
Mike Place
eab1680f3f Merge pull request #36659 from terminalmage/issue28125 
Support dynamic env in new-style git_pillar
 2016-09-29 14:04:38 +09:00
Mike Place
3249a11e71 Merge pull request #36661 from cachedout/fix_grain_test_race 
Fix race between minion job timeout and cli test timeout
 2016-09-29 13:42:23 +09:00
Mike Place
b0190f248e Merge pull request #36660 from cachedout/fix_2068_issue_test 
Fix test not to rely on external resources
 2016-09-29 13:42:01 +09:00
Mike Place
2dcb92134d
Fix race between minion job timeout and cli test timeout 2016-09-29 13:23:26 +09:00
Mike Place
f4906fe771
Fix test not to rely on external resources 
We can still model the original issue without needing to call all the way out to pypi to do it.
 2016-09-29 12:35:02 +09:00
Erik Johnson
45352b36bd Support dynamic env in new-style git_pillar 
This was accidentally omitted when I implemented the gitfs-backed
git_pillar for 2015.8.0. This commit adds that functionality back to
git_pillar.
 2016-09-28 21:51:15 -05:00
Mike Place
0c2bd4b66b Merge pull request #36538 from clinta/daemon-reload 
daemon-reload on call to service.avaliable
 2016-09-29 11:28:00 +09:00
Mike Place
d8a61eb9f6 Merge pull request #36616 from cro/zypper_fix_test 
Zypper fix test
 2016-09-29 11:26:22 +09:00
Mike Place
ccd92d22d2 Merge pull request #36621 from terminalmage/fix-shadowed-builtins 
Fix shadowed builtins
 2016-09-29 11:25:54 +09:00
Mike Place
24f82b2809 Merge pull request #36636 from rallytime/bp-36618 
Back-port #36618 to 2016.3
 2016-09-29 11:23:09 +09:00
Mike Place
86dc3dc9f7 Merge pull request #36641 from fuzzy-id/fix-lvm-thin-argument 
fix thin argument for `lvm.lvcreate'
 2016-09-29 11:19:56 +09:00
Mike Place
750ff8220c Merge pull request #36648 from jfindlay/arch_test 
Integration tests for archive execution module
 2016-09-29 11:16:54 +09:00
Mike Place
91aa464d5d Merge pull request #36650 from saltstack/revert-36389-pr-36386 
Revert "Pr 36386"
 2016-09-29 11:11:15 +09:00
Justin Findlay
cc4d958557 modules.archive: add integration tests 2016-09-28 17:14:52 -06:00
C. R. Oldham
ab5c0e9e65 Merge pull request #36646 from rallytime/fix-36304 
Provide an error message when invalid transport is set
 2016-09-28 16:52:11 -06:00
C. R. Oldham
b618a5c07d Remove debugging 2016-09-28 16:26:56 -06:00
Nicole Thomas
33ef5bffe6 Revert "Pr 36386" 2016-09-28 15:51:48 -06:00
Nicole Thomas
6d9b28506c Merge pull request #36635 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-28 15:10:25 -06:00
Justin Findlay
99bf89447b modules.archive: add opts arg to g(un)zip 2016-09-28 15:06:03 -06:00
Justin Findlay
c1219e68c5 modules.archive.unzip: depend on zipfile module 2016-09-28 15:06:03 -06:00
Justin Findlay
315b031de9 modules.archive: use less redundant message 2016-09-28 15:06:03 -06:00
Clint Armstrong
833beb9b36 Merge pull request #1 from terminalmage/pr-36538 
Move check for service availability to a helper function
 2016-09-28 16:42:13 -04:00
Erik Johnson
c4060ba2c1 Move check for service availability to a helper function 
This allows for us to check for unit file changes at the beginning of
the available() function without invoking the available() function a
second time, potentially resulting in a recursive loop if not handled
delicately.
 2016-09-28 15:29:25 -05:00
rallytime
ae021d6dec Provide an error message when invalid transport is set 
Fixes #36304
 2016-09-28 13:58:06 -06:00
rallytime
787c1f557e Pylint fix 2016-09-28 10:20:18 -06:00
Erik Johnson
62729eff8d Update tests to include fix for renamed function 2016-09-28 11:00:33 -05:00
Yaroslav Molochko
275845c3d2 Fix memory leak for 0mq transport 
In case anyone is trying to "DDOS" zeromq transport with TCP messages,
we've got ZeroMQPubServerChannel process utilized more than 8GB of RAM.
With this patch, we have got ZeroMQPubServerChannel stabilized at 300MB
for > 500 nodes.
It doesn't affect performance for 0mq minions, as it perform gc.collect
only in case of exception.
 2016-09-28 09:11:55 -06:00
rallytime
da574e5b03 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/runners/thin.py
 2016-09-28 09:01:24 -06:00
Mike Place
f0d561a229 Merge pull request #36632 from isbm/isbm-thin-modules-config-15.8 
Configure thin/min modules permanently
 2016-09-28 22:21:11 +09:00
Mike Place
83da81cdfd Merge pull request #36620 from rallytime/fix-36553 
Don't allow mercurial states to return True with errors
 2016-09-28 14:50:50 +09:00