valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,876 Commits 24 Branches 182 Tags 341 MiB
895d8cee5c
Commit Graph

94876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rares POP
895d8cee5c Merge branch 'develop' into dev/iepopr/add_salt-api_windows 
Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 11:57:09 +03:00
Rares POP
c640b5cd42 Add salt-api on Windows platform 
salt-api is broken on Windows platform
due to pickling issues on the salt.loader.netapi
Workaround that by creating a runner class
that can be pickled.

Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 11:38:08 +03:00
Nicole Thomas
e456f84d95
Merge pull request #47939 from steveno/make_postgres_version_compare_more_robust 
Make postgres version compare more robust
 2018-06-08 16:02:32 -04:00
Nicole Thomas
160cdb20fd
Merge pull request #47490 from plastikos/issue-13889 
Support Jinja imports with relative paths. Issue #13889
 2018-06-08 15:57:37 -04:00
plastikos
a6a5441510
Merge branch 'develop' into issue-13889 2018-06-08 11:23:11 -06:00
Gareth J. Greenaway
b91a4fff96
Merge pull request #48033 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 10
 2018-06-08 08:27:02 -06:00
rallytime
8ece87778e
Reduce the number of days an issue is stale by 10 2018-06-08 10:08:38 -04:00
Nicole Thomas
bec663ed24
Merge pull request #48023 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-08 09:55:00 -04:00
Nicole Thomas
8930617331
Merge pull request #47793 from slivik/ini_manage-dry-run 
Fixes dry run in ini_manage + Fixes related bug - when working with o…
 2018-06-08 09:45:41 -04:00
Nicole Thomas
a7e633ebe8
Lint: Remove extra whitespace 2018-06-08 09:42:32 -04:00
Nicole Thomas
c1c8b36639
RST Syntax Fix: code-blocks need a blank line 2018-06-08 09:38:58 -04:00
slivik
d837cba3a3 Merge branch 'ini_manage-dry-run' of https://github.com/slivik/salt into ini_manage-dry-run 2018-06-08 10:45:42 +02:00
slivik
5fadacc362
pylint cosmetics. 2018-06-08 10:44:54 +02:00
plastikos
1be25616a7
Add Jinja include relative paths to Fluorine release notes 2018-06-08 02:02:07 -06:00
plastikos
540bcde985
Merge branch 'develop' into issue-13889 2018-06-08 01:50:02 -06:00
rallytime
d991430715
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-06-07 13:03:54 -04:00
Mike Place
ea85f882bc
Merge pull request #47915 from garethgreenaway/state_runner_pause_resume_kill 
[2018.3] state runner pause resume kill
 2018-06-07 10:08:29 -06:00
Nicole Thomas
5c11fcde60
Merge pull request #48002 from rallytime/bp-47923 
Back-port #47923 to 2018.3
 2018-06-07 11:25:38 -04:00
Nicole Thomas
3d0a087c71
Merge pull request #48003 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-07 11:25:19 -04:00
Nicole Thomas
0a05212f60
Merge pull request #48022 from morganwillcock/patch-1 
win_wua state: fix function name in examples
 2018-06-07 11:03:51 -04:00
Nicole Thomas
406efb161e
Merge pull request #48015 from garethgreenaway/47546_more_unicode_nonsense 
[2018.3] more unicode nonsense in archive module
 2018-06-07 10:44:54 -04:00
Nicole Thomas
c23ea22f6d
Merge pull request #48011 from terminalmage/docs-develop 
Clean up Sphinx build errors in develop branch
 2018-06-07 10:42:13 -04:00
Nicole Thomas
5b4e7953e8
Merge pull request #47951 from rares-pop/dev/iepopr/fix_nilinuxrt_core_grains 
Fix NI Linux RT distribution core grains
 2018-06-07 10:36:09 -04:00
Morgan Willcock
443f4d6f21
win_wua state: fix function name in examples 
Changes 'up_to_date' to 'uptodate'
 2018-06-07 15:34:59 +01:00
Gareth J. Greenaway
f457f9cb84
Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name. 2018-06-06 21:23:28 -07:00
Gareth J. Greenaway
9af49bc595
Ensure member names are decoded before adding to various lists. 2018-06-06 21:23:27 -07:00
Erik Johnson
04a80673a2
Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
Steven Oliver
48503b423e
Correct comments on functions 
* Add more tests
 2018-06-06 19:54:52 -04:00
Nicole Thomas
713ae1dca7
Merge pull request #48005 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-06 17:22:45 -04:00
Nicole Thomas
3de777393d
Merge pull request #47950 from gmsoft-tuxicoman/fstab-fix 
Fix parsing fstab when dump and pass aren't present
 2018-06-06 17:21:59 -04:00
Gareth J. Greenaway
2ecbe9c034
fixing typo in alias_function call. 2018-06-06 13:52:45 -07:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. 2018-06-06 13:52:45 -07:00
Daniel Wozniak
1ce7d6c38a
Merge pull request #47989 from dwoz/awscloud 
Properly decode password from aws using m2crypto
 2018-06-06 13:44:28 -07:00
Nicole Thomas
76068c83f5
Merge pull request #47976 from terminalmage/salt-jenkins-1000 
Capture and log output of processes that timed out and were killed
 2018-06-06 15:17:08 -04:00
Nicole Thomas
2f8ea4a59d
Merge pull request #48004 from terminalmage/salt-jenkins-1008 
Update tests to reflect changes in #47580
 2018-06-06 15:02:45 -04:00
Nicole Thomas
9f1b932c21
Merge branch 'develop' into ini_manage-dry-run 2018-06-06 13:56:24 -04:00
Nicole Thomas
aa9b45d0be
Merge pull request #47677 from moench-tegeder/alternatives_install 
fix states.alternatives.install to really install alternative
 2018-06-06 13:55:56 -04:00
Guy Martin
9d056ace8d Remove extra space. 2018-06-06 19:51:08 +02:00
rallytime
bf08bcf5f9
Update old invalid_kwargs path to use new utils path 2018-06-06 13:38:06 -04:00
rallytime
7dc1e770c4
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/topics/installation/freebsd.rst
  - salt/cloud/clouds/oneandone.py
  - salt/grains/core.py
  - salt/modules/napalm_ntp.py
  - salt/modules/win_update.py
  - salt/modules/win_wua.py
  - salt/modules/zabbix.py
  - salt/renderers/pass.py
  - salt/states/vault.py
  - tests/unit/states/test_win_update.py
 2018-06-06 13:35:36 -04:00
Nicole Thomas
f12a52736e
Merge pull request #47990 from terminalmage/2018.3-docs 
Docs fixes in 2018.3 release branch
 2018-06-06 13:15:16 -04:00
Daniel A. Wozniak
23ab2727be
Fix linter errors 2018-06-06 09:43:04 -07:00
Erik Johnson
e5a2f53a0d
Update tests to reflect changes in #47580 2018-06-06 11:19:08 -05:00
rallytime
a6533a9332
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-06-06 11:55:29 -04:00
Bo Maryniuk
9465e5f1e9
Use to_unicode from stringutils avoid deprecation warning 2018-06-06 11:51:36 -04:00
Bo Maryniuk
73d33cbfc3
Prevent crash if files in file.recurse 2018-06-06 11:50:45 -04:00
Nicole Thomas
998a1c13d5
Merge pull request #47966 from mbunkus/fix-postfix-prefix-free-key-names-assumption 
Fix postfix.set_main's assumption of prefix-free key names
 2018-06-06 11:43:23 -04:00
Nicole Thomas
56e0ed7996
Merge pull request #47977 from terminalmage/get_config_dir 
Use @property instead of @staticmethod for config_dir
 2018-06-06 11:32:33 -04:00
Nicole Thomas
da66e1af7c
Merge pull request #47964 from nocturo/fix47921 
Fix 47921
 2018-06-06 11:27:00 -04:00
Nicole Thomas
9d56af3cad
Merge pull request #47982 from twangboy/fix_test_win_dns_client 
Fix `unit.modules.test_win_dns_client` tests
 2018-06-06 11:02:10 -04:00