valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,988 Commits 24 Branches 182 Tags 341 MiB
e92478c211
Commit Graph

73988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
e92478c211 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-21 09:20:42 -06:00
Mike Place
ac3a755fe3 Merge pull request #36437 from DSRCorporation/bugs/36134_minion_failover_schedule_fix 
Keep the schedule jobs in ONE place.
 2016-09-21 20:55:57 +09:00
Mike Place
f0daf7fceb Merge pull request #36463 from hs-hannover/add_env_to_gitignore 
Add "/env/" to .gitignore
 2016-09-21 20:55:07 +09:00
Mike Place
b03b61acb1 Merge pull request #36357 from shorawitz/patch-1 
Add options for SSL connection
 2016-09-21 20:36:41 +09:00
Tim Fechner
d232d70135 Add "/env/" to .gitignore 2016-09-21 13:28:49 +02:00
Mike Place
1cfa346c89 Merge pull request #36328 from jandd/develop 
Add thin-provisioning support for LXC containers
 2016-09-21 16:00:16 +09:00
Mike Place
c273a753c1 Merge pull request #36396 from damon-atkins/Fix_36252_n_cmd.shell_info 
New cmd.shell_info. Fixed win_dsc & win_psget  Slowdown of Minion (36252) Add defensive programming to win_dsc & win_psget
 2016-09-21 15:37:31 +09:00
Mike Place
a41022efc3 Merge pull request #36447 from jfindlay/bp-36431 
Backport #36431: Try/except psutil process access in OSX
 2016-09-21 14:52:39 +09:00
Mike Place
3947712e2d Merge pull request #36458 from isntall/patch-3 
Fix typo
 2016-09-21 14:17:45 +09:00
Archie
8f514f2841 Fix typo 2016-09-20 21:07:33 -07:00
Nicole Thomas
065c83c2f2 Merge pull request #36443 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-20 17:18:44 -06:00
Nicole Thomas
0d1373cc97 Merge pull request #36444 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-20 17:18:23 -06:00
Mike Place
487aae25b5 Lint 2016-09-20 12:50:39 -06:00
Mike Place
9d2eab47c1 Try/except psutil process access in OSX 
Refs https://github.com/saltstack/qa/issues/244
 2016-09-20 12:50:39 -06:00
rallytime
514d6012f3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-20 10:49:36 -06:00
rallytime
7bcbf8dc36 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
 2016-09-20 10:43:55 -06:00
Nicole Thomas
2bb20a8488 Merge pull request #36361 from garrettheel/github-fixes-and-improvements 
Bug fixes and privacy disable feature for github state
 2016-09-20 09:47:48 -06:00
Damon Atkins
d965374692 .e.g. '\\d' to r'\d' 2016-09-21 01:07:00 +10:00
Damon Atkins
7565878d9b Fixed ConvertTo-Json -Depth 2016-09-21 00:51:39 +10:00
Mike Place
d0a495f08b Merge pull request #36310 from thatch45/keep_loop 
Fix bug where the client will destroy the loop
 2016-09-20 22:14:23 +09:00
Mike Place
6e16ca46ed Merge pull request #36394 from oba11/module-fixes 
fix accound_id in boto_iam and get_region in boto_sns
 2016-09-20 22:11:28 +09:00
Mike Place
2b49a45768 Merge pull request #36431 from cachedout/psutil_os_x 
Try/except psutil process access in OSX
 2016-09-20 22:05:42 +09:00
Dmitry Kuzmenko
6cc93b1e8f Keep the schedule jobs in ONE place. 2016-09-20 14:43:45 +03:00
Mike Place
67b78c7d97 Merge pull request #36423 from kraney/boto_apigateway_usage_plan 
Boto apigateway usage plan
 2016-09-20 15:47:03 +09:00
Mike Place
2789294a16 Merge pull request #36407 from skizunov/develop4 
PY3: Fix "file.managed" state
 2016-09-20 15:44:48 +09:00
Mike Place
8a6162214b Merge pull request #36405 from skizunov/develop3 
PY3: Fix error when applying salt state
 2016-09-20 15:44:10 +09:00
Mike Place
ae1fc430c2 Merge pull request #36424 from jfindlay/bp-36194 
skip some mac_timezone tests
 2016-09-20 15:43:47 +09:00
Mike Place
6319e3419a Merge pull request #36428 from terminalmage/issue36388 
A couple fixes for Antergos Linux
 2016-09-20 15:42:16 +09:00
Mike Place
155bd14b5e Merge pull request #36425 from whiteinge/salt-api-dict-payload 
Check for dictionary explicitly since we're accessing it as one
 2016-09-20 15:41:40 +09:00
Mike Place
6c1b3f5af4
Lint 2016-09-20 15:40:00 +09:00
Mike Place
420be364ee Merge pull request #36199 from thatch45/fix_18341 
skip all failhards if test=True
 2016-09-20 14:38:32 +09:00
Mike Place
d0f44c95f5
Try/except psutil process access in OSX 
Refs https://github.com/saltstack/qa/issues/244
 2016-09-20 14:35:25 +09:00
Erik Johnson
b0069ad0d8 pacman.py: use os_family grain to assign as pkg virtual module 
This is a more future-proof method, it'll keep us from continuing to
update pacman.py each time we add another Arch derivative to the Arch
os_family.
 2016-09-19 22:20:51 -05:00
Erik Johnson
5d632dbfca Properly set os grain for Antergos 2016-09-19 22:17:00 -05:00
Erik Johnson
0ae8dca2d0 pkg.list_upgrades: Ignore "downloading" lines in pacman output 
It appears that Antergos distributes a modified version of pacman which
adds additional lines while updating its package databases. These are
incorrectly interpreted as available upgrades. This commit checks for
these lines in the output and skips them.
 2016-09-19 22:11:09 -05:00
Garrett Heel
f1e293c28a Bug fixes and privacy disable feature for github state 2016-09-20 11:01:15 +09:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
Seth House
0b63ed258f Check for dictionary explicitly since we're accessing it as one 
Fixes #36373.
 2016-09-19 16:43:52 -06:00
Thomas S Hatch
5d2f952052 Merge pull request #36414 from cro/clean_old_jobs_interval2 
Use better check for jobs to clean and archive
 2016-09-19 16:37:31 -06:00
Nicole Thomas
b2365f553e Merge pull request #36418 from rallytime/bp-36246 
Back-port #36246 to 2016.3
 2016-09-19 15:56:52 -06:00
Nicole Thomas
bc703e2062 Merge pull request #36419 from rallytime/bp-36329 
Back-port #36329 to 2016.3
 2016-09-19 15:56:33 -06:00
Nicole Thomas
fbfa0657fc Merge pull request #36420 from rallytime/bp-36365 
Back-port #36365 to 2016.3
 2016-09-19 15:56:16 -06:00
Nicole Thomas
5dc06a3a29 Merge pull request #36421 from rallytime/bp-36395 
Back-port #36395 to carbon
 2016-09-19 15:55:54 -06:00
Winston Liu
df8648d5e3 lint clean up's. 2016-09-19 14:52:41 -07:00
kbelov
632de87807 Merge branch 'boto_apigateway_usage_plan' of https://github.com/kraney/salt into boto_apigateway_usage_plan 2016-09-19 14:38:59 -07:00
kbelov
b61dc5abda added unit tests for boto_apigateway module for usage plans and usage plan associations 2016-09-19 14:37:52 -07:00
Rajvi Dhimar
bb439eacde Update carbon.rst 2016-09-19 14:33:12 -06:00
=
864e513fca Fix a minor typo in docs 2016-09-19 14:32:10 -06:00
Oz N Tiram
ffdebf7a25 Fix a minor typo in docs 2016-09-19 14:30:34 -06:00
Erik Johnson
aab02f28b4 Ensure we have a test venv created using virtualenv < 13.0 
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
 2016-09-19 14:27:30 -06:00