John Jawed
b09e5b4379
Fix #43295 , better handling of consul initialization issues
2017-09-05 16:27:42 -04:00
Erik Johnson
433bca14b1
Fix KeyError in yumpkg configparser code on Python 3
...
It looks like the configparser in Python 3 does not insert the
`__name__` key in each section. Popping it without a default causes a
KeyError on Python 3. This commit fixes that KeyError.
2017-09-05 15:13:22 -05:00
Erik Johnson
f6c16935d8
Move --showduplicates before repository-packages
...
As of Fedora 26, dnf interprets arguments after "repository-packages" as
arguments to the repository-package subcommand, which breaks
pkg.list_repo_pkgs on that Fedora release. Moving this argument earlier
in the command allows pkg.list_repo_pkgs to work.
2017-09-05 15:10:05 -05:00
Daniel Wallace
9911b04208
fix test
2017-09-05 13:52:02 -06:00
Nicole Thomas
1a012eb3d7
Merge pull request #43359 from gtmanfred/ipaddr
...
ipaddr_start ipaddr_end for el7
2017-09-05 15:44:23 -04:00
Mike Place
8f88111be8
Merge pull request #43247 from rallytime/mentionbot-backports
...
Back-port various mention bot settings to 2016.11
2017-09-05 12:17:53 -06:00
Daniel Wallace
23d9abb560
ipaddr_start ipaddr_end for el7
2017-09-05 11:20:47 -06:00
Daniel Wallace
3c6ae99a77
never-download got readded
...
https://github.com/pypa/virtualenv/pull/840
2017-09-05 10:35:05 -06:00
Damon Atkins
fc9c61d12e
Update win_pkg.py
2017-09-06 02:28:16 +10:00
Damon Atkins
c91fc14704
Merge branch '2016.11' into 2016.11
2017-09-03 17:27:37 +10:00
Damon Atkins
cb3af2bbbd
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli ( #2 )
2017-09-03 17:23:44 +10:00
Ken Jordan
ba0cdd4536
Fix phrasing for mine_interval description
2017-09-01 15:13:20 -06:00
Ken Jordan
9ff03c2d43
Update Salt Mine documentation to show that the mine_interval option is configured in minutes.
2017-09-01 14:57:10 -06:00
Mike Place
02867fdcd2
Merge pull request #43277 from rallytime/owners-file
...
Add CODEOWNERS file
2017-09-01 10:56:52 -06:00
Nicole Thomas
1c1c484479
Merge pull request #43312 from lordcirth/fix-cron-docs
...
cron docs: Remind user to use quotes for special strings
2017-09-01 12:24:15 -04:00
Nathan Fish
ec94a13750
cron docs: Remind user to use quotes for special strings
...
Otherwise @ signs are stripped.
https://github.com/saltstack/salt/issues/2896
2017-09-01 10:20:46 -05:00
Nicole Thomas
0d1ed4b750
Merge pull request #43290 from lordcirth/fix-file-path-docs
...
Clarify file.py docs
2017-09-01 10:30:03 -04:00
Nathan Fish
14a4591854
file.py docs: correct group and mode
2017-08-31 13:59:07 -05:00
Nathan Fish
d4214ca283
file.py docs: specify absolute paths
2017-08-31 13:44:12 -05:00
rallytime
2b4da0f0e7
Add CODEOWNERS file
2017-08-31 09:28:47 -04:00
Nicole Thomas
26ff89539e
Merge pull request #43274 from terminalmage/fix-int-types
...
Use six.integer_types instead of int
2017-08-30 17:32:42 -04:00
Erik Johnson
d533877743
Use six.integer_types instead of int
...
This catches longs on PY2.
2017-08-30 14:35:04 -05:00
Nicole Thomas
cf21f91fb2
Merge pull request #43271 from twangboy/win_fix_pkg.install
...
Fix minor formatting issue
2017-08-30 14:35:11 -04:00
twangboy
91b062f564
Fix formatting issue, spaces surrounding +
2017-08-30 10:41:21 -06:00
Nicole Thomas
c9d4fdbd45
Merge branch '2016.11' into issue-35840-fix-preserve-minion-cache-2016.11
2017-08-30 12:09:29 -04:00
Nicole Thomas
3a0b02f3ae
Merge pull request #43228 from twangboy/win_fix_pkg.install
...
Win fix pkg.install
2017-08-30 10:26:21 -04:00
twangboy
13dfabb1ce
Fix regex statement, add .
2017-08-29 13:27:18 -06:00
twangboy
31ff69f0ad
Add underscore to regex search
2017-08-29 11:43:59 -06:00
twangboy
3cf2b6575c
Fix spelling
2017-08-29 11:43:59 -06:00
twangboy
ed030a35a5
Use regex to detect salt-minion install
2017-08-29 11:43:59 -06:00
twangboy
e5daff495a
Fix pkg.install
...
I jacked this up previously
convert cmd to a list
use cmd.extend
2017-08-29 11:43:59 -06:00
Nicole Thomas
93a68e32a5
Merge branch '2016.11' into issue-35840-fix-preserve-minion-cache-2016.11
2017-08-29 11:28:15 -04:00
rallytime
2b85757d73
Always notify tkwilliams when changes occur on boto files
2017-08-29 11:17:41 -04:00
Colton Myers
40b5a29f90
Add basepi to userBlacklist for mention bot
2017-08-29 11:17:30 -04:00
rallytime
bad8f56969
Always notify ryan-lane when changes occur on boto files
2017-08-29 11:16:35 -04:00
rallytime
0d5a46dbaa
Update release branch section with a few more details
2017-08-29 09:38:11 -04:00
Mike Place
b4c689dff5
Merge pull request #43191 from viktorkrivak/fix-apache-config-multi-entity
...
Fix apache.config with multiple statement
2017-08-28 12:13:43 -06:00
Nicole Thomas
b90e59ede9
Merge pull request #43154 from lomeroe/bp-43116-2016.11
...
Backport #43116 to 2016.11
2017-08-28 12:40:40 -04:00
Viktor Krivak
c15bcbe1cc
Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity
2017-08-28 17:01:35 +02:00
lomeroe
8f593b0b02
verify that files exist before trying to remove them, win_file.remove
...
raises an exception if the file does not exist
2017-08-28 09:24:25 -05:00
Nicole Thomas
5308c27f9f
Merge pull request #43202 from garethgreenaway/42642_2016_11_augeas_module_revert_fix
...
Reverting previous augeas module changes
2017-08-28 09:14:27 -04:00
Mike Place
f16b7246e4
Merge pull request #43103 from aogier/43101-genesis-bootstrap
...
genesis.bootstrap deboostrap fix
2017-08-25 14:48:23 -06:00
Nicole Thomas
4863771428
Merge pull request #42663 from StreetHawkInc/fix_git_tag_check
...
Check remote tags before deciding to do a fetch #42329
2017-08-25 16:14:31 -04:00
Gareth J. Greenaway
ef7e93eb3f
Reverting this change due to it breaking other uses.
2017-08-25 12:52:26 -07:00
Mike Place
4193e7f0a2
Merge pull request #43199 from corywright/disk-format-alias
...
Add `disk.format` alias for `disk.format_`
2017-08-25 13:21:07 -06:00
Mike Place
5471f9fe0c
Merge pull request #43196 from gtmanfred/2016.11
...
Pin request install to version for npm tests
2017-08-25 12:43:05 -06:00
lomeroe
33a30bac06
correcting bad format statement in search for policy to be disabled
2017-08-25 12:31:12 -05:00
Cory Wright
f00d3a9ddc
Add disk.format alias for disk.format_
2017-08-25 13:29:40 -04:00
Daniel Wallace
ccd2241777
Pin request install to version
...
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751 , we can still
test the functionality. This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.
This should be more stable.
2017-08-25 10:23:35 -06:00
Nicole Thomas
ace2715c60
Merge pull request #43178 from terminalmage/issue43143
...
git.detached: Fix traceback when rev is a SHA and is not present locally
2017-08-25 09:58:36 -04:00
