Commit Graph

91002 Commits

Author SHA1 Message Date
Super-User
505b816914 Phase 0 - salt.utils.zfs 2018-02-24 13:37:42 +01:00
Super-User
7b32faa0ce Phase 0 - salt.utils.zfs tests 2018-02-24 13:37:42 +01:00
Nicole Thomas
8aaac011b4
Merge pull request #45905 from jasperla/pf
add execution module for OpenBSD Packet Filter
2018-02-23 14:28:17 -05:00
Nicole Thomas
90353c90f8
Merge pull request #45820 from iustinam/reusetok
Make vault session token reusable
2018-02-23 14:26:29 -05:00
Nicole Thomas
606d70c521
Merge pull request #45945 from xyoun/develop
pip.list_all_versions now can read index_url
2018-02-23 14:23:48 -05:00
Nicole Thomas
ebd3b0d88c
Merge pull request #46003 from rrzaripov/update_win_network_ip_addrs
Updating functions win_network.ip_addrs
2018-02-23 14:22:54 -05:00
Nicole Thomas
803138f5e5
Merge pull request #46130 from areaxx/develop
[#46028] strictly separate extension with and without classifier
2018-02-23 14:11:31 -05:00
Gareth J. Greenaway
36facd3f18
Merge pull request #46169 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
2018-02-23 11:09:32 -08:00
rallytime
b97eafc85e
Reduce the number of days an issue is stale by 10 2018-02-23 14:06:25 -05:00
Jasper Lievisse Adriaanse
a973b70d64
add execution module for OpenBSD Packet Filter 2018-02-22 21:08:35 +01:00
Nicole Thomas
fd0482b26b
Merge pull request #45458 from mchugh19/zabbix-inventory
Add Zabbix inventory support
2018-02-21 14:17:05 -05:00
Nicole Thomas
e5d2f071b9
Merge pull request #46115 from samodid/fix_45837
update digitalocean salt-cloud driver
2018-02-21 10:23:05 -05:00
Nicole Thomas
1b01f5d3f8
Merge branch 'develop' into zabbix-inventory 2018-02-21 09:56:05 -05:00
Reto Welti
872c44092e [#46028] strictly separate extension with and without classifier 2018-02-21 14:05:32 +01:00
Nicole Thomas
49c1fc6faf
Merge pull request #46088 from rongzeng54/master
fix kernel subpackages install bug
2018-02-20 17:50:46 -05:00
Nicole Thomas
93c389ee5e
Merge pull request #46112 from terminalmage/salt-jenkins-825
Fix failure to build docs in develop branch
2018-02-20 16:41:48 -05:00
Nicole Thomas
60ee64af40
Merge pull request #46029 from areaxx/develop
[#46028] do the version check with packaging AND classifier
2018-02-20 16:35:10 -05:00
Nicole Thomas
b1907c0ef2
Merge pull request #45689 from rrroo/sentry_mod_exclude_patterns
Add "exclude_patterns" option to Sentry log handler.
2018-02-20 16:29:08 -05:00
Nicole Thomas
a257ec9aaf
Merge branch 'develop' into develop 2018-02-20 16:19:33 -05:00
Volodymyr Samodid
0fe52c253d
update digitalocean salt-cloud driver
fix #45837
2018-02-20 23:04:17 +02:00
rrzaripov
02326cef03 Change versionadded to Fluorine in win_network.is_private docs 2018-02-20 22:44:41 +03:00
rrzaripov
9113f06ee6 Merge branch 'update_win_network_ip_addrs' of https://github.com/rrzaripov/salt into update_win_network_ip_addrs 2018-02-20 22:41:41 +03:00
Renat Zaripov
bb412993dc
Merge branch 'develop' into update_win_network_ip_addrs 2018-02-20 22:32:28 +03:00
Nicole Thomas
0101c7279e
Merge pull request #46091 from cro/vultr_startup_script
Add ability to specify a startup script id in a profile.
2018-02-20 12:36:14 -05:00
Erik Johnson
3df29121fb
Fix failure to build docs in develop branch
The docs are failing to build with the following error:

Failed to import 'salt.cloud.clouds.azurearm'; the module executes
module level statement and it might call sys.exit().

The "cleanup" done in 982c55cf broke docs builds on develop. It made a
number of unnecessary changes, for puzzling reasons. The `__opts__` and
`__utils__` dunders do not need to be manually created, they're present
automagically courtesy of the loader.

This removes all of the module level calls and replaces the helpers with
calls to the corresponding functions from the `__utils__` dunder.
2018-02-20 10:29:31 -06:00
Erik Johnson
8ce0f29842
Add rst file for new module 2018-02-20 10:21:29 -06:00
Gareth J. Greenaway
f36b14dbf2
Merge pull request #46079 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
2018-02-18 15:55:18 -08:00
C. R. Oldham
d4524abd7e
Lint 2018-02-17 14:56:27 -07:00
C. R. Oldham
69c6e7a289
Docs 2018-02-17 14:50:59 -07:00
C. R. Oldham
730ab90054
Add ability to specify a startup script id in a profile. 2018-02-17 14:44:16 -07:00
xyoun
50f26f767e
Merge branch 'develop' into develop 2018-02-18 00:39:31 +08:00
xy@zhihu.com
77ae131e20 add version tag in pip.list_all_versions 2018-02-18 00:33:28 +08:00
zr
405510be53 fix kernel subpackages install bug 2018-02-17 23:31:26 +08:00
Renat Zaripov
77d70657f2 Merge branch 'update_win_network_ip_addrs' of https://github.com/rrzaripov/salt into update_win_network_ip_addrs 2018-02-17 12:18:05 +03:00
Renat Zaripov
883f8b75c6 Fix missed is_private method 2018-02-17 12:15:45 +03:00
Nicole Thomas
7897d7922c
Merge pull request #45851 from garethgreenaway/38625_overriding_retcode
[develop] Ability to override retcode from various cmdmod functions
2018-02-16 14:54:55 -05:00
rallytime
dec24ae9bd
Reduce the number of days an issue is stale by 10 2018-02-16 12:59:49 -05:00
Nicole Thomas
75fdf72c98
Merge branch 'develop' into 38625_overriding_retcode 2018-02-16 11:39:36 -05:00
Nicole Thomas
dbc34d2842
Merge pull request #46059 from tjgruber/patch-1
Broken Fedora cloud image link fixed
2018-02-16 09:46:46 -05:00
Nicole Thomas
94fa990170
Merge pull request #45919 from garethgreenaway/port_45844_to_develop
[develop] Porting PR #45844 to Develop branch.
2018-02-16 09:36:43 -05:00
tjgruber
c56b60a1ec
Broken Fedora cloud image link fixed
http://fedoraproject.org/en/get-fedora#clouds
is broken. 
New url is: https://alt.fedoraproject.org/cloud/
2018-02-15 20:27:01 -08:00
Nicole Thomas
ce2d348368
Merge branch 'develop' into sentry_mod_exclude_patterns 2018-02-15 15:06:56 -05:00
Nicole Thomas
bdcb3cb302
Merge pull request #45994 from nullify005/more-route53-fixes
Fix hosted zone Comment updates & quote TXT entries correctly
2018-02-15 15:00:22 -05:00
Nicole Thomas
ece4452953
Merge pull request #45078 from aphor/macports
update macports doc, portfile
2018-02-15 14:17:33 -05:00
Nicole Thomas
c02cb3394c
Merge pull request #45769 from Zero-Down-Time/develop
Surpress boto WARNING during SQS msg decode in sqs_engine
2018-02-15 14:14:31 -05:00
rrzaripov
6ccb596b96 Merge remote-tracking branch 'upstream/develop' into update_win_network_ip_addrs 2018-02-15 22:13:20 +03:00
Nicole Thomas
be5f4eefab
Lint: Remove extra line 2018-02-15 14:00:59 -05:00
Nicole Thomas
907c179535
Merge pull request #45537 from mitodl/develop
Added the option to explicitly specify the user for django commands
2018-02-15 13:52:08 -05:00
Nicole Thomas
3bed490983
Merge pull request #46043 from edgan/zookeeper-znode-fix
Allow zookeeper znode creation to not require an ACL
2018-02-15 12:45:45 -05:00
Nicole Thomas
a3c04ad1c6
Merge branch 'develop' into port_45844_to_develop 2018-02-15 11:46:51 -05:00