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
87,031 Commits 24 Branches 182 Tags 341 MiB
71f2bc4776
Commit Graph

87031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
71f2bc4776 Merge branch 'develop' into panos-2017-9-26 2017-10-17 15:19:48 -06:00
Mike Place
d15de697f8 Merge pull request #44058 from mkoderer/issues/44056 
Use correct mac prefix for kvm/qemu
 2017-10-17 14:45:56 -06:00
Mike Place
d8e909777d Merge pull request #44014 from garethgreenaway/43961_sls_id_pillar 
[develop] Additions to state.sls_id
 2017-10-17 14:43:40 -06:00
Mike Place
72e39caed7 Merge branch 'develop' into 43961_sls_id_pillar 2017-10-17 14:43:22 -06:00
Mike Place
73c3581864 Merge pull request #44037 from vernondcole/vagrant-cloud 
Vagrant cloud and state modules
 2017-10-17 14:36:38 -06:00
Marc Koderer
c4d9684a90 Use correct mac prefix for kvm/qemu 
Using the private mac range for vms makes it impossible to
distinguish between hypervisors.

Issues #44056

Signed-off-by: Marc Koderer <marc.koderer@sap.com>
 2017-10-17 10:46:06 +02:00
Mike Place
b651ff0534 Merge pull request #44129 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-16 16:48:16 -06:00
Nicole Thomas
9dacbf69b9 Merge pull request #44127 from terminalmage/salt.utils 
Add top-level docstrings to a bunch of salt.utils modules which are missing them
 2017-10-16 16:28:27 -04:00
Mike Place
6c3a500beb Merge pull request #44060 from The-Loeki/doc-roster 
doc fixes for salt-ssh roster(s) opts
 2017-10-16 14:12:40 -06:00
rallytime
54c4be35ae
Update any moved utils references from the merge-forward 2017-10-16 15:47:32 -04:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop' 
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
 2017-10-16 15:26:19 -04:00
Mike Place
4d13e1961f Merge pull request #44119 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 25
 2017-10-16 13:07:02 -06:00
Nicole Thomas
22a8253595 Merge pull request #44090 from pratik705/fix-create_attach_volumes_salt-cloud_action-GCP 
Fix create_attach_volumes salt-cloud action for gcp
 2017-10-16 15:04:21 -04:00
Nicole Thomas
96dc6b0171 Merge pull request #44015 from gtmanfred/develop 
convert jinja context to dictionary
 2017-10-16 14:39:29 -04:00
Erik Johnson
473fbb18e9
Add top-level docstrings to a bunch of salt.utils modules which are missing them 2017-10-16 13:38:41 -05:00
Nicole Thomas
b13e129c6b Merge pull request #44117 from sahama/patch-1 
show_all remove
 2017-10-16 14:29:57 -04:00
Nicole Thomas
888e5f51a2 Merge pull request #44121 from benediktwerner/2017.7 
Fixed code snippet in unit testing documentation
 2017-10-16 14:28:36 -04:00
Nicole Thomas
9fe94d7843 Merge pull request #44098 from twangboy/win_mock_test_parsers 
Return multiprocessing queue in LogSetupMock class
 2017-10-16 14:14:29 -04:00
Nicole Thomas
413de95df2 Merge pull request #44103 from terminalmage/salt.utils 
Complete the salt.utils refactor
 2017-10-16 14:12:50 -04:00
Nicole Thomas
0ee04eaf1d Merge pull request #44118 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-16 13:01:37 -04:00
Mike Place
33bf0e1733 Merge pull request #44091 from quinot/bug/clustershell-host-addr-confusion 
Confusion between host name and address
 2017-10-16 10:25:01 -06:00
Mike Place
28fa097b9b Merge pull request #44099 from twangboy/win_skip_test_parsers 
Skip Master, Minion, and Syndic parser tests
 2017-10-16 10:06:59 -06:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc 2017-10-16 17:23:23 +02:00
rallytime
7d21d4253a
Reduce the number of days an issue is stale by 25 2017-10-16 10:30:45 -04:00
Nicole Thomas
dbf112ead7 Merge pull request #44106 from roaldnefs/fix-doc-mattermost_returner 
Fix mattermost returner documentation
 2017-10-16 09:12:23 -04:00
rallytime
bbec47afbc
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/aws.py
 2017-10-16 08:57:50 -04:00
Sayyid Hamid Mahdavi
be94aca2c3 show_all remove 
show_all=True,  removed from beacon execution module so it should remove here also
 2017-10-16 15:16:33 +03:30
Erik Johnson
877abb89d0
Complete the salt.utils refactor 
This moves the remaining 30 functions from salt.utils to new locations.
 2017-10-15 09:43:31 -05:00
Roald Nefs
b3761a0401
Fix doc indentation in mattermost_returner 2017-10-14 13:33:04 +02:00
twangboy
caf086c05a
Skip Master, Minion, and Syndic parser tests 2017-10-13 16:02:01 -06:00
twangboy
cc43ca27af
Return multiprocessing queue in LogSetupMock class 2017-10-13 15:47:19 -06:00
garethgreenaway
c960ca32c2 Merge pull request #44092 from techhat/awsunicode 
Made sure that unicoded data is sent to sha256()
 2017-10-13 14:20:11 -07:00
garethgreenaway
22dbed1e45 Merge branch 'develop' into vagrant-cloud 2017-10-13 13:08:50 -07:00
Nicole Thomas
78e46b3a68 Merge pull request #44075 from terminalmage/salt.utils.files 
Move 14 more functions from salt.utils
 2017-10-13 14:56:12 -04:00
Gareth J. Greenaway
b8a2cd7544
Clarifying documention for pillar kwarg for sls and sls_id. 2017-10-13 09:15:41 -07:00
Gareth J. Greenaway
cc962ba400
Updating docstring with right versionadded information 2017-10-13 09:15:41 -07:00
Gareth J. Greenaway
c1a3b048a4
Adding the ability to pass pillar values in when using state.sls_id 2017-10-13 09:15:41 -07:00
Joseph Hall
bbd9db4d00
One more encoding 2017-10-13 10:04:50 -06:00
Joseph Hall
0e8b325667
Apparently __salt_system_encoding__ is a thing 2017-10-13 09:54:26 -06:00
Joseph Hall
1e7211838d
Use system encoding 2017-10-13 09:51:32 -06:00
Nicole Thomas
fd2c51b76c Merge pull request #44054 from eyj/boto_lc 
Backport of missing delete_on_termination
 2017-10-13 11:45:24 -04:00
Nicole Thomas
76cc5ba689 Merge branch 'develop' into develop 2017-10-13 11:44:17 -04:00
Joseph Hall
1af21bbe5e
Made sure that unicoded data is sent to sha256() 2017-10-13 09:35:51 -06:00
Thomas Quinot
4ab5d5d390 Confusion between host name and address 
Keys in target dict are host names (as expanded by clustershell),
not addresses.
 2017-10-13 16:34:49 +02:00
Nicole Thomas
b61ed96268 Merge pull request #44076 from Ch3LL/spm_test 
Add spm shell tests
 2017-10-13 10:32:18 -04:00
Nicole Thomas
b617c85519 Merge pull request #44084 from senthilkumar-e/doc_update 
Fixing a typo in the troubleshooting document
 2017-10-13 10:29:50 -04:00
Pratik Bandarkar
3eefd334c5 Fixed "create_attach_volumes" salt-cloud action for GCP 
Fixes #44088
    - "create_attach_volumes" salt-cloud works with mandatory and
      default arguments as mentioned in docstring of the function.
 2017-10-13 14:29:39 +00:00
Erik Johnson
2d4d8fa9c8
Convert "Can be removed" lines into TODO lines 2017-10-13 09:29:03 -05:00
Erik Johnson
c6b655b6e9
Move 14 more functions from salt.utils 
These functions are:

salt.utils.test_mode -> salt.utils.args.test_mode
salt.utils.split_input -> salt.utils.args.split_input
alt.utils.pem_finger -> salt.utils.crypt.pem_finger
salt.utils.is_bin_file -> salt.utils.files.is_binary
salt.utils.list_files -> salt.utils.files.list_files
salt.utils.safe_walk -> salt.utils.files.safe_walk
salt.utils.st_mode_to_octal -> salt.utils.files.st_mode_to_octal
salt.utils.normalize_mode -> salt.utils.files.normalize_mode
salt.utils.human_size_to_bytes -> salt.utils.files.human_size_to_bytes
salt.utils.get_hash -> salt.utils.hashutils.get_hash
salt.utils.is_list -> salt.utils.data.is_list
salt.utils.is_iter -> salt.utils.data.is_iter
salt.utils.isorted -> salt.utils.data.sorted_ignorecase
salt.utils.is_true -> salt.utils.data.is_true
 2017-10-13 09:29:03 -05:00
Nicole Thomas
0238a6d713 Merge pull request #44061 from Shinzu/develop 
Add option to eagerly scrub the disk
 2017-10-13 09:57:02 -04:00