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
73,847 Commits 24 Branches 182 Tags 341 MiB
85907ef008
Commit Graph

73847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
85907ef008 Merge pull request #36485 from gtmanfred/carbon 
clean up keystone tests
 2016-09-22 13:12:36 +09:00
Mike Place
522da496ee Merge pull request #36487 from skizunov/develop2 
Windows: Fix module "file.check_file_meta" incorrect diff
 2016-09-22 13:09:39 +09:00
Sergey Kizunov
55687d67e7 Change file.check_file_meta write mode to "w" 
In order to be consistent with how `file.manage_file` writes a file,
we make `file.check_file_meta` also write the file as "w" instead of "wb".
This is necessary so that diff functionality correctly identifies
identical files when the source file is multi-line.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-21 14:58:26 -05:00
Daniel Wallace
8deb342488 clean up keystone tests 
Don't want to overwrite the stuff for the glance tests
 2016-09-21 14:43:42 -05:00
Sergey Kizunov
bc3301007b Windows: Fix module "file.check_file_meta" incorrect diff 
On Windows, the module function `file.check_file_meta` would always
return a diff even when the files are identical. For instance, the files
are identical but this is returned:

```
"pchanges": {
  "diff": "--- \n+++ \n@@ -1 +1 @@\n
    -{\"Skyline.ExchangeName\":\"niskyline\",\"Skyline.Host\":\"127.0.0.1\",
      \"Skyline.Password\":\"Y5{9()*Dy:x(d&m:FKnmPFb+b5!!!Ya)\",
      \"Skyline.User\":\"niskyline\"}
    +{\"Skyline.ExchangeName\":\"niskyline\",\"Skyline.Host\":\"127.0.0.1\",
      \"Skyline.Password\":\"Y5{9()*Dy:x(d&m:FKnmPFb+b5!!!Ya)\",
      \"Skyline.User\":\"niskyline\"}\n"
}
```

This type of issue was already fixed within similar logic in
`file.manage_file` by using:

```
if salt.utils.is_windows():
    contents = os.linesep.join(contents.splitlines())
```

Add this exact same logic to `file.check_file_meta`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-21 14:01:40 -05:00
Nicole Thomas
9eb497a410 Merge pull request #36480 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-21 12:38:44 -06:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
 2016-09-21 10:43:38 -06:00
Mike Place
bc5ac9adae Merge pull request #36455 from twangboy/windows_installation_docs 
Update docs for Windows
 2016-09-21 23:28:28 +09:00
twangboy
ec67a9bb2f Add cachedout's recommendations 2016-09-21 07:39:20 -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
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
3d23371ca2 Merge pull request #36459 from cachedout/pr-36426 
Pr 36426
 2016-09-21 15:34:28 +09:00
Mike Place
bb5c01ae9d
Lint 2016-09-21 15:34:06 +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
twangboy
26a40dadbe Update docs for Windows 2016-09-20 17:19:40 -06: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
c8e15dcdca Merge pull request #36442 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-20 17:16:30 -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
7bcbf8dc36 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
 2016-09-20 10:43:55 -06:00
rallytime
2740fb7bfd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
 2016-09-20 10:39:53 -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
266dd7c00a Merge pull request #36379 from twangboy/windows_grains 
Fix windows osrelease grain
 2016-09-20 22:09:39 +09:00
Dmitry Kuzmenko
6cc93b1e8f Keep the schedule jobs in ONE place. 2016-09-20 14:43:45 +03: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
420be364ee Merge pull request #36199 from thatch45/fix_18341 
skip all failhards if test=True
 2016-09-20 14:38:32 +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
Robert James Hernandez
85d2068326 Refactor for testing and adding related engine tests 2016-09-19 17:10:19 -07: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
Robert James Hernandez
266adae2fd Make sqs_events engine support owner_acct_id 2016-09-19 14:59:47 -07: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
twangboy
6138390da7 Fix typo 2016-09-19 15:08:34 -06:00
twangboy
cf045e5c03 Remove comment 2016-09-19 15:05:20 -06:00
twangboy
ddb6e11bcb Remove refactoring 2016-09-19 15:02:04 -06:00
twangboy
45dc920db0 Clarify comments 2016-09-19 14:56:48 -06:00
twangboy
211fd3b47e Improve version checking 2016-09-19 14:49:43 -06:00