Nicole Thomas
e637ecbe86
Merge branch '2016.11' into 43386_2016_11_schedule_kwargs_pub
2017-09-11 18:05:01 -04:00
Mike Place
6db7a721c0
Merge pull request #43441 from meaksh/2016.11-salt-bash-completion-fix
...
Use $HOME to get the user home directory instead using '~' char
2017-09-11 15:25:19 -06:00
Mike Place
05fff44a50
Merge pull request #43445 from rallytime/bump-deprecation-warning
...
Bump deprecation warning for boto_vpc.describe_route_table
2017-09-11 15:23:28 -06:00
rallytime
c91cd1c6d9
Bump deprecation warning for boto_vpc.describe_route_table
...
This deprecation warning needs to be bumped out to Neon instead
of Oxygen.
See Issue #43223 for more details.
2017-09-11 16:21:09 -04:00
Pablo Suárez Hernández
be4f26ab21
Use $HOME to get the user home directory instead using '~' char
2017-09-11 20:23:25 +02:00
Gareth J. Greenaway
6114df8dc3
Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item.
2017-09-11 11:20:33 -07:00
Mike Place
c57dc5f0e3
Merge pull request #43432 from rallytime/bp-43419
...
Back-port #43419 to 2016.11
2017-09-11 11:36:36 -06:00
Daniel Wallace
c471a29527
make cache dirs when spm starts
2017-09-11 09:53:32 -04:00
Nicole Thomas
57cccd75d0
Merge pull request #43390 from aogier/43387-genesis-qemu
...
better qemu_static parameter mangle in deboostrap management, tests
2017-09-11 09:18:29 -04:00
Alessandro -oggei- Ogier
496f14a7e7
forgot to mock the proper one
2017-09-08 21:37:09 +02:00
Alessandro -oggei- Ogier
51c7a1ba00
only check if static_qemu is_executable()
2017-09-08 10:27:29 +02:00
Alessandro -oggei- Ogier
70642e495d
better qemu_static parameter mangle in deboostrap management, tests
2017-09-08 10:17:32 +02:00
Nicole Thomas
6106aec696
Merge pull request #43356 from gtmanfred/2016.11
...
never-download got readded
2017-09-07 13:46:04 -04:00
Nicole Thomas
e638fac54e
Merge pull request #43325 from doesitblend/salt-mine-doc-fix
...
mine_interval option is minutes not seconds
2017-09-07 12:58:10 -04:00
Nicole Thomas
3f19b247f3
Add handler.messages back in for test comparison
2017-09-07 11:51:39 -04:00
Nicole Thomas
1e94d0ac3a
Lint: Remove trailing whitespace
2017-09-07 09:21:42 -04:00
Ken Jordan
51af8f8757
Fix mine_interval phrasing in default file
2017-09-06 16:25:53 -06:00
Nicole Thomas
fc587f784a
Merge pull request #43105 from aogier/43086-no-member
...
groupadd module: string does not have attribute 'extend', plus homogeneous `cmd` parm building
2017-09-06 11:49:43 -04:00
Nicole Thomas
5111cf8bad
Merge branch '2016.11' into 43086-no-member
2017-09-06 10:41:18 -04:00
Nicole Thomas
d97a680372
Merge pull request #43333 from damon-atkins/2016.11
...
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
2017-09-06 10:21:34 -04:00
Damon Atkins
92de2bb498
Update doco
2017-09-06 12:31:51 +10:00
Mike Place
0c986f5eba
Merge pull request #43361 from rallytime/bp-43329
...
Back-port #43329 to 2016.11
2017-09-05 17:23:00 -06:00
Mike Place
22287439e6
Merge pull request #42903 from junovitch/issue-35840-fix-preserve-minion-cache-2016.11
...
Fix 'preserve_minion_cache: True' functionality (fixes #35840 )
2017-09-05 16:57:13 -06:00
Mike Place
4860e10757
Merge pull request #43360 from terminalmage/sj-496
...
Fix failing tests in Fedora
2017-09-05 16:23:12 -06:00
Mike Place
4ba2dbe41e
Merge pull request #43244 from rallytime/release-branch-clarifications
...
Update release branch section with a few more details
2017-09-05 14:27:58 -06:00
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
