valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,559 Commits 24 Branches 182 Tags 341 MiB
358707d84a
Commit Graph

84559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
d707f94863 Update all other calls to "cmp" function 
Some should just use the new utility function, while others can just
be compared more directly.
 2017-08-07 15:38:39 -04:00
rallytime
5605104285 Add a cmp compatibility function utility 
The ``cmp`` function has been removed in Python 3. This PR adds the
functionality as a salt utility, so the function can be used across
all Python versions.

Fixes #42697
 2017-08-07 15:05:46 -04:00
lomeroe
22c375dc77 fix #42600 in develop 
attempt to write data to regpol file even if data_to_write is empty
(i.e. no policies configured)
 2017-08-07 13:49:39 -05:00
rallytime
f49da018e4 Sort lists before compairing them in python 3 unit test 2017-08-07 14:38:10 -04:00
Nicole Thomas
7bf2cdb363 Merge pull request #42388 from The-Loeki/patch-1 
pillar.items pillar_env & pillar_override are never used
 2017-08-07 13:51:47 -04:00
Carson Anderson
3f088c06c0 Add redis cluster functionality 
Add cluster support to the redis cache and returner modules.

Signed-off-by: Carson Anderson <ca@carsonoid.net>
Signed-off-by: Scott King <scottking@sking3-ml.domo.com>
 2017-08-07 11:39:52 -06:00
Nicole Thomas
9a8c9ebffc Merge pull request #42770 from rallytime/merge-2017.7.1-into-2017.7 
[2017.7] Merge forward from 2017.7.1 to 2017.7
 2017-08-07 12:21:44 -04:00
Nicole Thomas
c765e528d0 Merge pull request #42768 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-07 12:21:16 -04:00
Jonathan LaBroad
671f955583 Merge branch 'develop' into bugfix/set-correct-win32-attributes-when-extracting-zip 2017-08-07 12:07:42 -04:00
Mike Place
5dc7321533 Merge pull request #42766 from morganwillcock/windisk 
Disk grain: attempt to retrieve HDD and SSD info on Windows
 2017-08-07 10:03:48 -05:00
Erik Johnson
665de2d1f9 Fix domainname parameter input translation 
Resolves #42538
 2017-08-07 09:51:14 -05:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00
rallytime
6d17c9d227 Merge branch '2017.7.1' into '2017.7' 
No conflicts.
 2017-08-07 10:39:19 -04:00
Nicole Thomas
3f5827f61e Merge pull request #42651 from gtmanfred/2017.7 
python2- prefix for fedora 26 packages
 2017-08-07 10:35:04 -04:00
Nicole Thomas
3858bc99b8 Merge pull request #42650 from cachedout/fixup_42369 
Fix mixins error with new yaml dumper
 2017-08-07 10:19:11 -04:00
rallytime
0f75482c37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/netapi/rest_tornado/saltnado.py
 2017-08-07 09:57:03 -04:00
Glaberrd
261ec2306a Merge branch 'develop' into yumpkg-install-performance 2017-08-07 08:24:53 +02:00
Mike Place
82582f0304 Merge pull request #42174 from mcalmer/2017.7-kubernetes-cert-auth 
kubernetes: provide client certificate authentication
 2017-08-06 13:10:24 -05:00
Mike Place
7b2119feee Merge pull request #42669 from garethgreenaway/42642_2016_11_augeas_module_fix 
[2016.11] Fixes to augeas module
 2017-08-06 12:58:02 -05:00
Mike Place
ea16eb24cd Merge pull request #42658 from alektant/patch-1 
Update libvirt.rst
 2017-08-06 12:52:30 -05:00
Mike Place
281482ae6f Merge branch 'develop' into yumpkg-install-performance 2017-08-06 12:50:10 -05:00
Mike Place
791248e398 Merge pull request #42689 from hibbert/boto_efs_fix_tags 
boto_efs_fix_tags: Fix #42688 invalid type for parameter tags
 2017-08-06 12:47:06 -05:00
garethgreenaway
2572ce7aad Merge branch 'develop' into fixup_42369 2017-08-05 14:59:07 -07:00
Morgan Willcock
318dd5f83b Call isdigit 2017-08-05 22:26:44 +01:00
Morgan Willcock
4188a93b94 Make disk grain work on Windows 2017-08-05 21:32:55 +01:00
garethgreenaway
1b3407649b Merge pull request #42745 from terminalmage/issue42705 
docker.compare_container: treat null oom_kill_disable as False
 2017-08-05 08:28:19 -07:00
Aljosha Friemann
9ddccbf8d5 Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files. 2017-08-05 13:36:07 +02:00
Erik Johnson
710bdf6115 docker.compare_container: treat null oom_kill_disable as False 
Resolves #42705.
 2017-08-04 21:47:07 -05:00
Adam Mendlik
e0b29ed265 Add SDB support to flat roster 2017-08-04 17:47:39 -06:00
Mike Place
5d5b22021b Merge pull request #42704 from whiteinge/expr_form-warn-scope-bug 
Add import to work around likely multiprocessing scoping bug
 2017-08-04 18:03:13 -05:00
Mike Place
17259dd9b0 Replace tabs with spaces 2017-08-04 16:49:08 -06:00
Jonathan LaBroad
2dfdce69dc Use extract_perms parameter of archive.extracted and set win32 attributes in archive.unzip 2017-08-04 15:16:14 -04:00
garethgreenaway
7ab66574a0 Merge branch 'develop' into patch-1 2017-08-04 10:26:37 -07:00
garethgreenaway
3e6abee1af Merge branch 'develop' into consul_fix 2017-08-04 10:04:25 -07:00
garethgreenaway
888e954e73 Merge pull request #42743 from kkoppel/fix-issue-42741 
Fix docker.compare_container for containers with links
 2017-08-04 09:00:33 -07:00
garethgreenaway
de6d3cc0cf Update dockermod.py 2017-08-04 08:59:33 -07:00
garethgreenaway
03a7f9bbee Merge pull request #42710 from gtmanfred/syndic 
use subtraction instead of or
 2017-08-04 08:14:13 -07:00
Michal Glabicki
d77b7ef09c changed AvailablePackages to subclass salt.utils.lazy.LazyDict 2017-08-04 15:20:49 +02:00
Kristjan Koppel
58b997c67f Added a helper function that removes container names from container HostConfig:Links values to enable compare_container() to make the correct decision about differences in links. 
Fixes #42741
 2017-08-04 15:35:41 +03:00
Melissa Michels
08b38086ee Merge branch 'develop' into fix-file.absent-inconsistency 2017-08-04 08:24:16 -04:00
Mike Place
547ada9418 Merge pull request #42612 from nhavens/develop 
fix for issue #42611
 2017-08-03 17:37:05 -05:00
Mike Place
b8acf9f6ec Merge pull request #42624 from lyft/modernize-boto-sqs-modules 
Modernize boto_sqs execution and state modules
 2017-08-03 17:34:18 -05:00
Mike Place
30725769ed Merge pull request #42629 from xiaoanyunfei/tornadoapi 
tornado api
 2017-08-03 17:21:19 -05:00
Mike Place
f0f00fcee1 Merge pull request #42655 from whiteinge/rest_cherrypy-reenable-stats 
Reenable cpstats for rest_cherrypy
 2017-08-03 15:44:10 -05:00
Mike Place
58ea6d87c9 Merge branch 'develop' into patch-1 2017-08-03 15:35:53 -05:00
Mike Place
005182b6a1 Merge pull request #42670 from gtmanfred/kube 
render kubernetes docs
 2017-08-03 15:30:55 -05:00
Mike Place
df354ddabf Merge pull request #42712 from twangboy/win_build_pkg 
Remove master config file from minion-only installer
 2017-08-03 15:25:02 -05:00
Mike Place
21cf15f9c3 Merge pull request #42693 from gilbsgilbs/fix-rabbitmq-tags 
Fix RabbitMQ tags not properly set.
 2017-08-03 15:23:08 -05:00
Melissa Michels
aa61d88982 Set force=true when removing a windows directory 2017-08-03 16:20:01 -04:00
Daniel Wallace
683561a711 use subtraction instead of or 
If we use or, we will get minions that are in the ret list, but not connected
to the master in cases where the syndic is used.
 2017-08-03 09:02:49 -06:00