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

10853 Commits

Author SHA1 Message Date
garethgreenaway
e870ca1ef4 Merge branch 'develop' into 41510_mount_opts 2017-09-15 16:19:09 -07:00
Nicole Thomas
9a66d5cebc Merge pull request #43495 from rallytime/move_arg_utils 
Move 2 arg-related utility functions into salt.utils.args.py
 2017-09-15 17:29:10 -04:00
garethgreenaway
2c091ecaae Merge branch 'develop' into 41510_mount_opts 2017-09-15 12:44:31 -07:00
Mike Place
a1b871304b Merge pull request #43345 from ribx/develop 
better atom extraction from portage version string
 2017-09-15 12:29:25 -06:00
Mike Place
b262695301 Merge pull request #43493 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-15 12:23:09 -06:00
garethgreenaway
787f141504 Merge branch 'develop' into 41510_mount_opts 2017-09-15 08:43:06 -07:00
Erik Johnson
792cc0eb54 Merge pull request #43203 from rallytime/fix-21969 
Return a SaltInvocationError when passing incorrect function pattern for wheel/runner functions.
 2017-09-14 12:17:48 -05:00
rallytime
75abf0a2a9 Test fix: update mock util path 2017-09-14 11:01:06 -04:00
Nicole Thomas
aee52a20e0 Lint: Add empty line at end of file 2017-09-14 09:48:09 -04:00
Robin Lutz
e1428dec5f corrected some PEP8 problems reported by jenkins 2017-09-14 14:24:54 +02:00
rallytime
acb98bbce2 Move salt.utils.argspec_report to salt.utils.args.py 2017-09-13 18:12:52 -04:00
rallytime
9df868930a Move salt.utils.arg_lookup to salt.utils.args.py 2017-09-13 17:37:49 -04:00
Nicole Thomas
f8ef7dce40 Merge pull request #43469 from alexbleotu/test_fixes-gh 
Fixed several tests
 2017-09-13 15:53:53 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
garethgreenaway
892d459f01 Merge branch 'develop' into 41510_mount_opts 2017-09-13 12:01:42 -07:00
Nicole Thomas
d2b13ce4c0 Merge pull request #43468 from terminalmage/git-configparser 
Fix unicode handling on PR #43378
 2017-09-13 13:57:17 -04:00
Gareth J. Greenaway
132b56d785 Updating mount to allow opts in the state file to be removed and have the volume remounted 2017-09-13 10:30:15 -07:00
Alexandru Bleotu
bf3785739e Fixed failing config.test_api tests for when the ROOT_DIR is / 2017-09-13 13:01:15 -04:00
Alexandru Bleotu
449dccdaa1 pylint 2017-09-13 05:13:01 -04:00
Alexandru Bleotu
0222a5a056 Fix to vsphere tests 2017-09-12 18:43:08 -04:00
Alexandru Bleotu
afa4921d37 Fixed vsphere tests to support the esxcluster proxy 2017-09-12 18:43:05 -04:00
Alexandru Bleotu
26710fa8fc Added tests for esxcluster execution module 2017-09-12 18:42:58 -04:00
Alexandru Bleotu
4113aa3ca7 Added tests for esxcluster proxy 2017-09-12 18:42:53 -04:00
Alexandru Bleotu
71c5725008 Merge branch 'develop' into test_fixes-gh 2017-09-12 23:31:37 +01:00
Alexandru Bleotu
f11a618274 Fixed Linux sysctl tests to be run in a local environment 2017-09-12 18:27:28 -04:00
Alexandru Bleotu
5c3dd00692 Updated config.test_api tests to take into account a ROOT_DIR override 2017-09-12 18:27:26 -04:00
Alexandru Bleotu
4cadfdcb56 Updated kubernetes tests to be skipped if library is not loaded 2017-09-12 18:27:23 -04:00
Erik Johnson
575ce9eb73 Fix unicode handling on PR 43378 
The strings passed to exceptions should not be unicode types, as this
can cause problems elsewhere when exception class instances are
referenced.
 2017-09-12 16:37:15 -05:00
Nicole Thomas
1016f585f5 Merge pull request #43378 from terminalmage/git-configparser 
Add a GitConfigParser class for manipulating git config files
 2017-09-12 17:10:43 -04:00
Mike Place
68d2558988 Merge pull request #43096 from lyft/add-util-func-for-state-return-merging 
Add utils function to merge state returns
 2017-09-12 11:02:14 -06:00
Mike Place
87ffd3f105 Merge pull request #42103 from davidjoliver86/ssh-config-roster 
ssh config roster for salt-ssh
 2017-09-12 10:38:49 -06:00
Erik Johnson
626129f5a3 Import all of configparser into module for easier access to error classes 2017-09-12 11:37:13 -05:00
Erik Johnson
507c1b871e Add a GitConfigParser class for manipulating git config files 
This class is designed to be used for (among other things) gitfs and git_pillar, to enforce config settings which reside in a git config file without resorting to using the git CLI.
 2017-09-12 11:37:13 -05:00
Mike Place
1a81663e46 Merge pull request #43302 from lyft/upstream-boto_cloudfront 
Upstream boto_cloudfront execution and state modules
 2017-09-12 10:10:20 -06:00
ribx
b712f971f7 Merge branch 'develop' into develop 2017-09-12 11:49:29 +02:00
Aneesh Agrawal
2e9f1999f6 Upstream boto_cloudfront execution and state modules 
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
 2017-09-11 23:36:31 +00:00
Mike Place
08d102c869 Merge pull request #41943 from twangboy/win_unit_test_local_cache 
Fix `unit.returners.test_local_cache` for Windows
 2017-09-11 15:34:02 -06:00
Mike Place
50ab79f0cb Merge pull request #43424 from twangboy/win_unit_test_hosts 
Fix `unit.modules.test_hosts` for Windows
 2017-09-11 15:28:41 -06: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
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
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
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
Mike Place
ca091bc8a4 Merge pull request #43438 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-11 12:33:38 -06:00
Mike Place
a9592dd3e2 Merge pull request #43320 from twangboy/win_fix_alternatives 
Fix `unit.modules.test_alternatives` for Windows
 2017-09-11 11:27:59 -06:00
Mike Place
9b89e49846 Merge pull request #43363 from twangboy/scratch_ini_tests 
Fix `unit.modules.test_ini_manage` for Windows
 2017-09-11 11:10:30 -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