valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,092 Commits 24 Branches 182 Tags 341 MiB
f02b02032d
Commit Graph

78092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Breuer
3a089e450f Added tests for pid-file deletion in DaemonMixIn 
This is a follow up on this PR:
https://github.com/saltstack/salt/pull/43366

Since we can get an OSError durin PIDfile deletion with non-root users, it
would make sense to also test for this. So here are the two test cases.
One with an OSError and the other one without.
 2017-09-20 14:34:30 +02:00
Mike Place
cfb1625741 Merge pull request #43591 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.11.8 to 2016.11
 2017-09-19 10:18:33 -06:00
rallytime
57b9d642c2 Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-09-18 16:40:05 -04:00
Nicole Thomas
8671b91f62 Merge pull request #43572 from vutny/fix-salt-cloud-list-min-instance-set 
cloud.action: list_nodes_min returns all EC2 instances
 2017-09-18 16:36:43 -04:00
Mike Place
e83421694f Merge pull request #43550 from twangboy/osx_fix_preinstall_2016.11.8 
Fix preinstall script on OSX for 2016.11.8
 2017-09-18 12:34:11 -06:00
Andrew Colin Kissa
b1b4dafd39 Fix CSR not recreated if key changes 2017-09-18 18:05:55 +02:00
Denys Havrysh
21966e7ce8 cloud.action: list_nodes_min returns all instances 2017-09-18 16:34:59 +03:00
twangboy
1b0a4d39d2 Fix logic in /etc/paths.d/salt detection 2017-09-15 13:37:53 -06:00
twangboy
1546c1ca04 Add posix=False to call to salt.utils.shlex_split 2017-09-15 11:16:50 -06:00
garethgreenaway
a648f75949 Merge pull request #43508 from rallytime/bp-43333 
Back-port  #43333 to 2016.11.8
 2017-09-14 14:40:19 -07:00
Damon Atkins
d4981a2717 Update doco 2017-09-14 12:25:30 -04:00
Damon Atkins
a7c8b9e048 Update win_pkg.py 2017-09-14 12:25:30 -04:00
Damon Atkins
1d6dc6fb72 Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (#2) 2017-09-14 12:25:30 -04:00
Mike Place
f2b86fa2db Merge pull request #43461 from twangboy/win_norestart 
Add `/norestart` switch to vcredist install
 2017-09-12 14:33:45 -06:00
twangboy
2d269d1a76 Change all comment markers to '#' 2017-09-12 12:59:57 -06:00
twangboy
d80aea16cb Handle ErrorCodes returned by VCRedist installer 2017-09-12 11:56:17 -06:00
twangboy
fb31e9a530 Add /norestart switch to vcredist install 2017-09-12 10:05:36 -06:00
Mike Place
90e8ca9c36 Merge pull request #43366 from brejoc/2016.11.pidfile-fix 
Catching error when PIDfile cannot be deleted
 2017-09-12 09:31:15 -06:00
Mike Place
a6c458607a Merge pull request #43442 from garethgreenaway/43386_2016_11_schedule_kwargs_pub 
[2016.11] Fixes to scheduler __pub values in kwargs
 2017-09-12 09:16:19 -06:00
Mike Place
3c429299f9 Merge pull request #43456 from rallytime/43445_follow_up 
Add Neon to version list
 2017-09-12 09:00:26 -06:00
rallytime
35c1d8898d Add Neon to version list 
Follow up to #43445
 2017-09-12 09:36:34 -04:00
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
Mike Place
e7009877bc Merge pull request #43434 from rallytime/2016.11.8-release-notes 
Add 2016.11.8 release notes
 2017-09-11 11:06:28 -06:00
rallytime
68f529ee5e Add 2016.11.8 release notes 2017-09-11 10:58:16 -04: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
Jochen Breuer
6e3eb76c79
Removed unused format argument 2017-09-06 13:16:10 +02:00
Jochen Breuer
daf4948b3d
Catching error when PIDfile cannot be deleted 
Usually the PIDfile is locate in /run. If Salt is not started with root
permissions, it is not able to delete the PIDfile in /run. It should
be safe to just log and ignore this error, since Salt overwrites the
PIDfile on the next start.
 2017-09-06 10:20:55 +02: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