Commit Graph

63640 Commits

Author SHA1 Message Date
abednarik
335999c6af modules.jenkins: __virtual__ return err msg.
Updated message in jenkins module when return False if python libraries are not installed.
2015-12-18 21:35:49 -03:00
Ronald van Zantvoort
f2ef7fcb64 pylint fixes 2015-12-19 00:47:24 +01:00
Ronald van Zantvoort
17f65276fc cpu_baseline: add full=True for older libvirts
Turns out older libvirts (Precise) don't support `VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES`; the additional code does the same.
2015-12-19 00:22:54 +01:00
Andrew Colin Kissa
f49abcccce remove function and use an import 2015-12-19 00:04:04 +02:00
Andrew Colin Kissa
5f7082b90d remove method_map function 2015-12-19 00:03:27 +02:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
2015-12-18 15:00:24 -07:00
Colton Myers
50f48c4bf3 Merge pull request #29850 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-18 14:33:49 -07:00
Colton Myers
037bcdea27 Merge pull request #29845 from abednarik/virtual_ret_github_module
modules.github: __virtual__ return err msg.
2015-12-18 14:21:38 -07:00
Colton Myers
d92a2402d4 Merge pull request #29849 from abednarik/virtual_ret_darwin_sysctl_module
modules.darwin_sysctl: __virtual__ return err msg.
2015-12-18 14:21:12 -07:00
Colton Myers
bc6df1bdb6 Merge pull request #29848 from abednarik/virtual_ret_bsd_shadow_module
modules.bsd_shadow: __virtual__ return err msg.
2015-12-18 14:20:51 -07:00
Erik Johnson
15047918a9 systemd test fixes
This removes a bunch of tests that don't test anything (see https://github.com/saltstack/salt/issues/29852).

It also changes some of the tests to reflect recent changes in
systemd.py.
2015-12-18 15:17:38 -06:00
Erik Johnson
b219998b4b Catch CommandExecutionError in service states
These were just added in systemd.py, we need to account for them.
2015-12-18 15:17:38 -06:00
Erik Johnson
c8a5decdf1 Optimizations/bugfixes/feature adds for systemd execution module
This makes some DRY changes, as well as fixing a bug introduced in
17b4538.

It also adds runtime masking support for the mask() function.
2015-12-18 15:17:38 -06:00
Winston Liu
e2b1da3407 fixed keyword arguments passing. 2015-12-18 13:10:35 -08:00
Andrew Colin Kissa
98593a94d5 fix various bugs in augeas modules
Fixes #29842
2015-12-18 23:01:44 +02:00
Colton Myers
7402599c62 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-18 13:55:15 -07:00
abednarik
763133c944 modules.darwin_sysctl: __virtual__ return err msg.
Updated message in darwin_sysctl module when return False if OS is not OSX.
2015-12-18 17:14:04 -03:00
abednarik
3b8e2bfa4d modules.bsd_shadow: __virtual__ return err msg.
Updated message in bsd_shadow module when return False if OS is not BSD family.
2015-12-18 17:03:00 -03:00
Thomas S Hatch
92eca34419 Add exclude_ext_pillar option 2015-12-18 12:30:49 -07:00
Thomas S Hatch
329a62e021 add cross call to ext_pilar 2015-12-18 12:24:06 -07:00
abednarik
4dfad98654 modules.github: __virtual__ return err msg.
Updated message in github module when return False if python libraries are not installed.
2015-12-18 16:20:26 -03:00
Mike Place
454efa1688 Merge pull request #29844 from abednarik/virtual_ret_gentoo_service_module
modules.gentoo_service: __virtual__ return err msg.
2015-12-18 12:14:24 -07:00
abednarik
77fbf84bb1 modules.gentoo_service: __virtual__ return err msg.
Updated message in gentoo_service module when return False if OS is not Gentoo.
2015-12-18 16:11:31 -03:00
Mike Place
1c1332df8a Merge pull request #29809 from cachedout/salt-fix-mod_random
Fix mod_random not loading on Python <= 2.6
2015-12-18 12:11:17 -07:00
Mike Place
78f7826521 Fix algorithm presence detection 2015-12-18 10:59:52 -07:00
Mike Place
e04d598fd9 Merge pull request #29841 from cachedout/virt_ret
Virt ret
2015-12-18 10:36:13 -07:00
Mike Place
a35728580e Lint 2015-12-18 10:35:02 -07:00
Mike Place
05d2aaaef2 Merge pull request #29811 from alprs/feature-influxdb_retention
influxdb: add retention policy module functions
2015-12-18 10:19:02 -07:00
Mike Place
5b2a003f4c Merge pull request #29813 from ickleio/s3_get_bug
S3 Get binary method bug
2015-12-18 10:17:35 -07:00
Mike Place
7eefaac58a Merge pull request #29814 from basepi/multi-master.windows.29396
[2015.8][Windows] Fix multi-master on windows
2015-12-18 10:16:52 -07:00
Mike Place
1b9d7a0940 Merge pull request #29816 from techhat/pacmanroot
Allow pacman to use alternate root dir
2015-12-18 09:29:47 -07:00
Mike Place
01c8742efd Merge pull request #29818 from techhat/useraddroot
Allow useradd and groupadd to use alternate root
2015-12-18 09:29:08 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
Mike Place
08e06b0c45 Merge pull request #29821 from abednarik/virtual_ret_freebsd_sysctl_module
modules.freebsd_sysctl: __virtual__ return err msg.
2015-12-18 09:20:13 -07:00
Mike Place
9564057971 Merge pull request #29822 from abednarik/virtual_ret_freebsdjail_module
modules.freebsdjail: __virtual__ return err msg.
2015-12-18 09:19:59 -07:00
Mike Place
0b77e78938 Merge pull request #29823 from abednarik/virtual_ret_freebsdports_module
modules.freebsdports: __virtual__ return err msg.
2015-12-18 09:19:47 -07:00
Mike Place
da833b7a62 Merge pull request #29824 from abednarik/virtual_ret_dpkg_module
modules.dpkg: __virtual__ return err msg.
2015-12-18 09:19:33 -07:00
Mike Place
30290e3e68 Merge pull request #29828 from skizunov/develop2
Only connect to event publisher when we want to listen
2015-12-18 09:14:49 -07:00
Mike Place
2ede52074d Merge pull request #29829 from emosher/add-infoblox-docs
Add infoblox documentation
2015-12-18 09:09:43 -07:00
Mike Place
35bf15633b Merge pull request #29827 from titilambert/develop
Add titilambert in AUTHORS file
2015-12-18 09:07:22 -07:00
Mike Place
e865c787a4 Merge pull request #29832 from jleimbach/fix-keyboard.py-for-rhel-without-systemd
Fixed typo in order to use the keyboard module for RHEL without systemd
2015-12-18 09:04:57 -07:00
Mike Place
7fed47d3a5 Merge pull request #29837 from lburg/fix_timezone_typo
states.timezone: Fix 'desrired' typo
2015-12-18 09:01:29 -07:00
Mike Place
29334413e2 Merge pull request #29838 from SeverinLeonhardt/fix_ssh_known_host_default_port
Correctly handle unset port in ssh set_known_host
2015-12-18 08:53:54 -07:00
lburg
6d1ab2ece0 states.timezone: Fix 'desrired' typo 2015-12-18 13:54:04 +01:00
Severin Leonhardt
501e58445f Correctly handle unset port in ssh set_known_host
According to the documentation the port parameter is optional and 22 is
used by default. But when the port was unset the hostname became:

    [hostname]:None

Instead only the hostname should be output, as if the default port value
were provided.
2015-12-18 13:36:45 +01:00
jle
7b72b3c52c Fixed typo in order to use the keyboard module for RHEL without systemd 2015-12-18 09:12:29 +01:00
Eric Mosher
0a765de370 Add infoblox documentation
Closes #29780
2015-12-17 23:01:55 -05:00
Sergey Kizunov
9ad3ae652b Only connect to publisher when we want to listen
Only connect to the publisher at event initialization time if
we know we want to listen. If we connect to the publisher
and don't read out events from the buffer on an on-going basis,
the buffer will grow resulting in big memory usage.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-12-17 21:43:18 -06:00
Sergey Kizunov
4ae2e29a61 Bugfix: Event's connect_pull() using wrong object
`connect_pull()` was erroneously using `self.subscriber` instead of
`self.pusher` when connecting. So it would only work if `self.subscriber`
was previously constructed with a call to `connect_pub`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-12-17 21:43:01 -06:00
Thibault Cohen
5f3ceea89c Add titilambert in AUTHORS file 2015-12-17 22:36:05 -05:00