valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,685 Commits 24 Branches 182 Tags 341 MiB
c682f86e38
Commit Graph

85685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
c682f86e38 Lint: Add empty line at end of file 2017-09-18 16:54:04 -04:00
spenceation
ac7e81b6e3 - Added support to parse XML ElementTrees with attributes. 2017-09-18 11:50:17 -04:00
Nicole Thomas
f1a93401d1 Merge pull request #43425 from garethgreenaway/42135_isolate_salt_scheduler 
Isolate Salt Scheduler
 2017-09-12 09:05:06 -04:00
Nicole Thomas
4b5bf54aa8 Merge pull request #43450 from mc/typofix20170912 
typofix 'tempalte' => 'template'
 2017-09-12 09:00:55 -04:00
Rico Gloeckner
f452860316 typofix 'tempalte' => 'template' 2017-09-12 08:24:56 +02:00
Mike Place
b4ca024e44 Merge pull request #43117 from garethgreenaway/slack_engine_class_fixes 
Slack engine class fixes
 2017-09-11 16:33:31 -06:00
Mike Place
ea4f903ed9 Merge pull request #43389 from raazvvann/nilrt_ip-fix-DNS 
nilrt_ip: Fix DNS
 2017-09-11 16:26:58 -06:00
Gareth J. Greenaway
8140cab71d Swapping the default value for the standalone from None to False to be more clear. 2017-09-11 14:31:00 -07:00
Gareth J. Greenaway
54cb69edec Renaming isolate to standalone 2017-09-11 14:31:00 -07:00
Gareth J. Greenaway
980d3f4a53 Adding the ability to isolate the scheduler to run outside of Salt minion or Salt master. 2017-09-11 14:31:00 -07:00
Mike Place
2ac185b055 Merge pull request #43439 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 15:18:40 -06:00
Mike Place
2c28156b89 Merge pull request #41619 from skizunov/develop2 
Add ability to set minion ID by module
 2017-09-11 15:16:50 -06:00
Mike Place
abb06552ec Merge pull request #43444 from garethgreenaway/43386_develop_schedule_kwargs_pub 
[develop] Fixes to scheduler __pub values in kwargs
 2017-09-11 15:13:07 -06:00
Mike Place
aad33df4af Merge pull request #41845 from mc/develop 
recomply modules/napalm_network.py to file.get_managed
 2017-09-11 14:25:16 -06:00
Mike Place
bb8bffde1a Merge pull request #42915 from garethgreenaway/missing_minions_branch 
Show missing minions in lists & nodegroups
 2017-09-11 13:38:55 -06:00
Mike Place
da16b6670a Merge pull request #42752 from skizunov/develop4 
Add config option to ensure jid is unique
 2017-09-11 13:38:30 -06:00
Mike Place
5c5df57efb Remove extra space for linter 2017-09-11 13:12:45 -06:00
Mike Place
9b60cc0d1f Merge pull request #43137 from aogier/x-no-grains-on-jenkins 
system group creation integration test
 2017-09-11 13:09:36 -06:00
Mike Place
2de83b95af Merge pull request #43182 from basepi/defaultgw 
[Feature] Add grains to detect default gateway
 2017-09-11 12:59:18 -06:00
Mike Place
0e42e8f9cc Merge pull request #43188 from alexbleotu/ext_pillar_config_param-gh 
Ext pillar config param gh
 2017-09-11 12:58:01 -06:00
Mike Place
e7a411c7f4 Merge pull request #43252 from rallytime/utils-files-moves 
Move salt.utils.istextfile to salt.utils.files.is_text_file
 2017-09-11 12:42:40 -06:00
rallytime
5413a5337e Lint: remove unused import 2017-09-11 14:34:20 -04:00
Gareth J. Greenaway
7c03bc2ee7 Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item. 2017-09-11 11:23:14 -07:00
Mike Place
940995c40d Merge pull request #43273 from lordcirth/add-nfs-state 
Add nfs_export state
 2017-09-11 11:49:40 -06:00
Mike Place
49288993c0 Merge pull request #43437 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 30
 2017-09-11 11:40:47 -06:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
 2017-09-11 12:55:39 -04:00
Mike Place
2964707e5d Merge pull request #43341 from ixs/fedora-rh_ip 
Fix rh_ip template use for Fedora
 2017-09-11 10:30:53 -06:00
Sergey Kizunov
b5360cf8fd Add warning to unique_jid option 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-11 11:19:59 -05:00
rallytime
eb91a073d8 Reduce the number of days an issue is stale by 30 2017-09-11 12:12:33 -04:00
Mike Place
9f421dde89 Merge pull request #43370 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 09:38:20 -06:00
Mike Place
654218bf65 Merge pull request #43392 from spenceation/panos/2017.9.6 
Panos 2017.9.6
 2017-09-11 09:25:48 -06:00
Mike Place
47d982fd37 Merge pull request #43415 from mattLLVW/fix-env-order 
Fix env_order in state.py
 2017-09-11 09:18:07 -06:00
Mike Place
e89e23a32e Merge pull request #43422 from twangboy/win_unit_cloud_ec2 
Fix `unit.cloud.clouds.test_ec2` for Windows
 2017-09-11 09:17:19 -06:00
Mike Place
54f833ac59 Merge pull request #43423 from twangboy/win_unit_test_gem 
Fix `unit.modules.test_gem` for Windows
 2017-09-11 09:15:28 -06:00
rallytime
e11aa7e5ef Adjust test mocking to handle __utils__['files.is_text_file'] 2017-09-11 10:25:00 -04:00
rallytime
eea53a1244 Change salt.utils.files.is_text_files calls to use __utils__ 2017-09-11 10:21:43 -04:00
rallytime
e1621f7b2e Lint: Add range import from six 2017-09-11 10:21:43 -04:00
rallytime
1279556873 Move salt.utils.istextfile to salt.utils.files.is_text_file 
Moves the original function to `salt.utils.files.py`, adds a deprecation
warning to the original function, and updates all of the istextfile
references in salt code.
 2017-09-11 10:21:43 -04:00
Nicole Thomas
b3116109e5 Merge pull request #43419 from gtmanfred/2017.7 
make cache dirs when spm starts
 2017-09-11 09:42:49 -04:00
Alexandru Bleotu
0882fed61a Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-10 18:46:57 +01:00
twangboy
b2cea18d13 Fix unit.modules.test_gem for Windows 
Mock `salt.utils.is_windows` to return False so the test will run on
Windows
 2017-09-08 15:53:07 -06:00
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows 
Mock instead of create tempfile
 2017-09-08 15:36:52 -06:00
Daniel Wallace
58378866e5 make cache dirs when spm starts 2017-09-08 14:16:09 -06:00
MattLLVW
f6313a1b2c Merge branch '2017.7' into fix-env-order 2017-09-08 19:00:50 +02:00
Nathan Fish
54dd4d3ef7 nfs_exports: linting and versionadded 2017-09-08 11:59:27 -05:00
Nicole Thomas
9b27473763 Merge pull request #43371 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-08 11:39:11 -04:00
matt
e93a962980 Fix env_order in state.py 
Fixes #42165
 2017-09-08 17:10:07 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount 
Fix `unit.modules.test_mount` for Windows
 2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam 
Fix `unit.modules.test_pam` for Windows
 2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted 
Fix `unit.modules.test_parted` for Windows
 2017-09-08 09:36:59 -04:00