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
83,611 Commits 24 Branches 182 Tags 341 MiB
13cc27bdab
Commit Graph

83611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
13cc27bdab Merge pull request #43734 from twangboy/win_unit_test_poudriere 
Fix `unit.modules.test_poudriere` for Windows
 2017-09-26 10:13:46 -04:00
Nicole Thomas
41aeee7ac8 Merge pull request #43742 from terminalmage/fix-docstring 
Fix incorrect value in docstring
 2017-09-26 09:54:59 -04:00
Erik Johnson
553335b1c9
Fix incorrect value in docstring 2017-09-26 07:52:59 -05:00
Erik Johnson
d78b9a3294 Merge pull request #41998 from twangboy/win_unit_test_environ 
Fix `unit.modules.test_environ` for Windows
 2017-09-26 07:25:48 -05:00
Erik Johnson
7fbbea3806 Merge pull request #42036 from twangboy/win_unit_test_file 
Fix `unit.modules.test_file` for Windows
 2017-09-26 07:23:09 -05:00
twangboy
922e60fa67
Add os agnostic paths 2017-09-25 15:25:31 -06:00
twangboy
d73ef44cf6
Mock with uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
048e16883f
Use uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
056f3bb4c0
Use with to open temp file 2017-09-25 09:35:25 -06:00
twangboy
352fe69e35
Clarify the purpose of the for loop 2017-09-25 09:35:25 -06:00
twangboy
b55172d5dc
Split by Windows and Linux style line endings 2017-09-25 09:35:24 -06:00
twangboy
e20aa5c39b
Fix line, use os.sep instead of os.linesep 2017-09-25 09:35:24 -06:00
twangboy
d5f27901e3
Fix additional bytestring issue 2017-09-25 09:35:24 -06:00
twangboy
716e99c453
Fix py3 bytestring problems 2017-09-25 09:35:24 -06:00
twangboy
543610570c
Fix bytestring issues, fix errored tests 2017-09-25 09:35:24 -06:00
twangboy
9fe83a34a5
Remove old variable declaration 2017-09-25 09:35:23 -06:00
twangboy
c5cf5e92c1
Fix many tests 2017-09-25 09:35:23 -06:00
Nicole Thomas
a81d4b8d8d Merge pull request #43557 from clan/yaml 
disable modify yaml constructor
 2017-09-25 10:03:47 -04:00
Nicole Thomas
b5beec16e8 Merge pull request #43566 from damon-atkins/2017.7_update_safe_filename_func 
2017.7 update salt.utils.files.safe_filepath func
 2017-09-25 09:58:28 -04:00
Nicole Thomas
3bb337cf6a Merge pull request #43712 from wedge-jarrad/fix-43711 
Ignore retcode on call to grep in selinux.py module
 2017-09-25 09:56:16 -04:00
Nicole Thomas
5b7411e335 Merge pull request #43716 from gaborn57/2017.7 
Corrected custom port handling
 2017-09-25 09:44:57 -04:00
Sebastien Huber
78137c0860 Corrected custom port handling 
This pillar was only able to connect to a Postgres DB running on the default port (5432)
This commit extend this to a custom port
 2017-09-25 10:00:52 +02:00
Mike Place
6bbd50c453 Merge pull request #43700 from rklaren/fix-libvirt-stderr-spam 
Ensure salt-cloud with libvirt provider does not write low level errors to stderr
 2017-09-24 19:47:25 -06:00
Mike Place
437ac03801 Merge pull request #43702 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-24 19:26:19 -06:00
Wedge Jarrad
96c1ef48e6 Ignore retcode on call to grep in selinux.py module 
Fixes #43711

Returning an exit code of 1 is normal operation of grep when it does not
find a match. This will happen every time this function is called by
fcontext_policy_present to detirmine whether a selinux policy exists
before creating it. Ignoring the retcode will prevent it from emitting
an error when this happens.
 2017-09-23 17:38:51 -07:00
Damon Atkins
c7a652784a remove blank line at end of file 2017-09-23 13:56:50 +10:00
Damon Atkins
e97651d49b Merge branch '2017.7' into 2017.7_update_safe_filename_func 2017-09-23 13:54:11 +10:00
garethgreenaway
132b1b343b Merge branch '2017.7' into merge-2017.7 2017-09-22 14:38:23 -07:00
Ric Klaren
88530c4cb6 Lint fixes 2017-09-22 15:39:28 -05:00
Ric Klaren
235bec492e salt-cloud + libvirt: Mention Fedora 26 support 2017-09-22 15:39:28 -05:00
Ric Klaren
9aecf5f847 Remove stderr spam when using salt-cloud with libvirt 
Install error handler and redirect stderr output to debug log.
 2017-09-22 15:39:28 -05:00
Mike Place
47cd8723c6 Merge pull request #43681 from terminalmage/issue38971-2017.7 
Backport the non-fileclient changes from PR 43518 to 2017.7
 2017-09-22 13:27:24 -06:00
Nicole Thomas
0a1c5185f5 Merge pull request #43687 from mkurtak/fix-43396 
yumpkg.py: install calls list_repo_pkgs only if wildcard is used in pkg name
 2017-09-22 15:23:17 -04:00
Mike Place
3a79549af4 Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex 
Bugs/43124 users regex
 2017-09-22 13:21:08 -06:00
Mike Place
485471c8a7 Merge branch '2017.7' into yaml 2017-09-22 12:28:17 -06:00
Damon Atkins
3b4c1bbf7f Merge branch '2017.7' into 2017.7_update_safe_filename_func 2017-09-23 04:04:36 +10:00
Mike Place
0e86266b93 Merge pull request #43670 from DSRCorporation/bugs/43381_redis_cache_fix 
Fix for `list` and `contains` redis cache logic.
 2017-09-22 11:56:57 -06:00
rallytime
6e5cf65d65
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-22 13:45:59 -04:00
Mike Place
f46c858f25 Merge pull request #43648 from rallytime/handle-boto-vpc-errors 
Handle VPC/Subnet ID not found errors in boto_vpc module
 2017-09-22 11:40:42 -06:00
Mike Place
aa47da35dd Merge pull request #43697 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-22 11:31:08 -06:00
Z. Liu
da15658304 remove modify yaml constructor 
which will modify the default behavior of yaml load.

Foe example, for following example (t.sls), it will cause the difference
between the content of file testa and testb, but it should be identical!

$ cat t
{%- load_yaml as vars %}
toaddr:
  - test@test.com
{%- endload -%}
{{ vars.toaddr }}
$ cat t.sls
/tmp/testa:
  file.managed:
    - source: salt://t
    - user: root
    - group: root
    - mode: "0755"
    - template: jinja

sys-power/acpid:
  pkg.installed:
    - refresh: False

/tmp/testb:
  file.managed:
    - source: salt://t
    - user: root
    - group: root
    - mode: "0755"
    - template: jinja
$ touch /tmp/test{a,b}
$ salt-call state.sls t
local:
----------
          ID: /tmp/testa
    Function: file.managed
      Result: None
     Comment: The file /tmp/testa is set to be changed
     Changes:
              ----------
              diff:
                  ---
                  +++
                  @@ -0,0 +1 @@
                  +['test@test.com']
----------
          ID: /tmp/testb
    Function: file.managed
      Result: None
     Comment: The file /tmp/testb is set to be changed
     Changes:
              ----------
              diff:
                  ---
                  +++
                  @@ -0,0 +1 @@
                  +[u'test@test.com']
 2017-09-22 23:25:21 +08:00
Nicole Thomas
91edf865e2 Merge branch '2017.7' into issue38971-2017.7 2017-09-22 10:50:57 -04:00
rallytime
cbae45bec4
Lint: Remove extra line at end of file 2017-09-22 10:33:10 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Dmitry Kuzmenko
1c979d5809 Update redis cache contains logic to use more efficient sismember. 2017-09-22 10:30:28 +03:00
Damon Atkins
4c88c80ef9 Merge branch '2017.7' into 2017.7_update_safe_filename_func 2017-09-22 13:53:18 +10:00
Mike Place
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify 
Fix `unit.utils.test_verify` for Windows
 2017-09-21 16:26:12 -06:00
Mike Place
ec34df2c27 Merge pull request #43680 from vernondcole/fix-salt.cache.Cache-default 
correct default value for salt.cache.Cache
 2017-09-21 14:09:35 -06:00
Michal Kurtak
b1e64b11fb yumpkg.py: install calls list_repo_pkgs only if wildcard in pkg name is used 
Fixes #43396
 2017-09-21 21:51:22 +02:00
Mike Place
99d9d784b1 Merge pull request #43530 from twangboy/win_fix_pkg.install 
Fixes removal of double-quotes by shlex_split in winrepo
 2017-09-21 12:04:47 -06:00