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
78,605 Commits 24 Branches 182 Tags 341 MiB
7ad11ff104
Commit Graph

78605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
7ad11ff104 Merge pull request #39571 from s0undt3ch/features/py3 
Moar Py3 fixes
 2017-02-23 13:10:01 +00:00
Pedro Algarvio
ce71f6d45f
Code cleanup 2017-02-23 12:55:53 +00:00
Pedro Algarvio
872d173769
The unicode type does not exist on Py3 2017-02-23 12:55:52 +00:00
Pedro Algarvio
9bb56da613
Fix skipIf call and _docker_py_version 2017-02-23 12:55:52 +00:00
Pedro Algarvio
80ded62a1a
The dictionary changes while iterating. 
Under Python 3, we don't get a list copy of the keys.
 2017-02-23 10:40:59 +00:00
Pedro Algarvio
a3d514476f
Only convert bytes 2017-02-23 10:40:59 +00:00
Pedro Algarvio
1416dd2e9a
We must compare tuples 2017-02-23 10:40:59 +00:00
Pedro Algarvio
8dc1c780b7
Add missing mock patch 2017-02-23 10:40:58 +00:00
Pedro Algarvio
e48ea8fa1b
Don't use assert_called_once() or assert_not_called(). 
These worked in Py2 but not in Py3.
A read of http://engineroom.trackmaven.com/blog/mocking-mistakes/ specially the section "Mocking the unexpected" will enlighten one.
 2017-02-23 10:40:58 +00:00
Pedro Algarvio
e16dc832b2
Code cleanup. Tests are not destructive. Py3 compat. 2017-02-23 10:40:58 +00:00
Mike Place
43e3cafac5 Merge pull request #39580 from twangboy/win_fix_fileserver_roots_tests 
Fix fileserver roots tests for Windows
 2017-02-22 19:16:30 -07:00
Mike Place
4279c39f41 Merge pull request #39576 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-22 19:09:56 -07:00
Mike Place
2b5caa3c35 Merge pull request #39581 from rallytime/fix-lint-develop 
[develop] Fix some pylint errors that snuck into develop
 2017-02-22 19:09:28 -07:00
rallytime
5db986860c [develop] Fix some pylint errors that snuck into develop 2017-02-22 17:02:21 -07:00
twangboy
db645da0bf Fix fileserver roots tests for Windows 2017-02-22 16:53:27 -07:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -07:00
Mike Place
a41c4ff9c9 Merge pull request #39567 from sum12/develop 
[msgpack] look for `datetime.datetime` in keys also while packing
 2017-02-22 11:57:47 -07:00
Mike Place
7ab258868d Merge pull request #39553 from sergeizv/py3-file-mode 
Make file perms check Python 3 compatible
 2017-02-22 11:56:19 -07:00
Mike Place
a9094ad088 Merge pull request #39504 from F30/dmidecode-warning 
Improve error handling for Grains virtual hardware identification
 2017-02-22 11:46:24 -07:00
Mike Place
6d12a8cb06 Merge pull request #39525 from zer0def/influx-query 
Added arbitrary query execution and additional parameters to continuous query creation for InfluxDB
 2017-02-22 11:33:02 -07:00
Mike Place
8cd9ee03a0 Merge pull request #39526 from theredcat/develop 
Fixes for solrcloud module
 2017-02-22 11:32:05 -07:00
Mike Place
b492f7094c Merge pull request #39528 from thatch45/ssl_docs 
Add better ssl option docs
 2017-02-22 11:29:46 -07:00
Mike Place
0dad49cdff Merge pull request #39532 from amontalban/corner_case_35869 
Fix case when /etc/localtime is a file and it is not updated
 2017-02-22 11:28:53 -07:00
Mike Place
b516e2968c Merge pull request #39539 from brd/doc-saltmine 
Improve the Salt Mine documentation
 2017-02-22 11:24:39 -07:00
Mike Place
9cfaf3b599 Merge pull request #39540 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-22 11:24:00 -07:00
Mike Place
e4c1872695 Merge pull request #39543 from techhat/spmmods 
Allow SPM to install all module types
 2017-02-22 11:18:23 -07:00
Mike Place
b5f7908a62 Merge pull request #39545 from zackhsi/alpine-iptables 
Support Alpine Linux iptables
 2017-02-22 11:17:40 -07:00
Mike Place
56fe2f198e Merge pull request #39554 from DSRCorporation/bugs/ssl_bool 
Cosmetic: support bool value for 'ssl' config option.
 2017-02-22 09:59:02 -07:00
Sumit Jamgade
b3b98a66df [msgpack] look for datetime.datetime in keys also while packing 
and `del` the old if the encoded key is different form the original one.
 2017-02-22 17:55:11 +01:00
Mike Place
5c53b6d24a Merge pull request #39558 from DSRCorporation/bugs/39368_broken_failover 
Don't use `__salt__` in salt.utils.minion. Removed unneeded function.
 2017-02-22 09:51:53 -07:00
Mike Place
72fcf9dcee Merge pull request #39556 from s0undt3ch/features/py3 
Require SaltPyLint >= v2017.2.22
 2017-02-22 09:50:56 -07:00
Mike Place
6b4960031e Merge pull request #39559 from mathieubouchard/develop 
Use the new hash syntax for file.patch
 2017-02-22 09:50:20 -07:00
Mike Place
cf37f83565 Merge pull request #39560 from vutny/cloud-detect-ips 
[CLOUD] Log error when private/public IP was not detected
 2017-02-22 09:49:46 -07:00
rallytime
49fe4e891e Merge branch '2016.11' into '2016.11' 
No conflicts.
 2017-02-22 08:54:57 -07:00
Denys Havrysh
567bb50884 [CLOUD] Log error when private/public IP was not detected 2017-02-22 16:52:04 +02:00
Mathieu Bouchard
c6fb1526aa Use the new hash syntax for file.patch 
Fixes issue https://github.com/saltstack/salt/issues/39512
 2017-02-22 09:11:12 -05:00
Dmitry Kuzmenko
c0d80488d2 Don't use __salt__ in salt.utils.minion. Removed unneeded function. 2017-02-22 15:32:20 +03:00
Pedro Algarvio
1dd7d8d88f
Require SaltPyLint >= v2017.2.22 
Minimal Python version for develop is now 2.7
 2017-02-22 12:15:31 +00:00
Dmitry Kuzmenko
7a6fc11291 Cosmetic: support bool value for 'ssl' config option. 
This is useful for minion config which doesn't need anything to be set
in ssl opts, but needs to enable it. In this case `ssl: True` looks
better than `ssl: {}` in yaml config.
 2017-02-22 14:06:26 +03:00
Sergei Zviagintsev
8c515fcade Make file perms check Python 3 compatible 
Compare file mode with Python 2-3 compatible octal constants.
 2017-02-22 11:38:40 +01:00
Sergei Zviagintsev
ad5b52ce3c Add unit test for salt.utils.cloud.check_key_path_and_mode 2017-02-22 11:38:40 +01:00
Sergei Zviagintsev
313e9cae06 Add unit test for _validate_key_file_permissions in ec2 module 2017-02-22 11:38:40 +01:00
Sergei Zviagintsev
4f1bb33018 ec2: Move key file path and mode validation into separate function 
Move the key file existence and mode validation from create() into a
separate function, so we can write unit tests for it and make create()
simpler.
 2017-02-22 11:38:40 +01:00
Sergei Zviagintsev
26c1280aa4 Fix condition in if-statement 
The latter part of the condition would never succeed. Remove it. Update
the comment.
 2017-02-22 11:38:40 +01:00
Pedro Algarvio
4a96490b61 Merge pull request #39537 from s0undt3ch/features/py3 
More Py3 compatibility fixes
 2017-02-22 10:21:00 +00:00
Pedro Algarvio
0b3071ee3a
.iter<items|keys|values>() Py3 compatibility 2017-02-22 10:20:26 +00:00
Zack Hsi
e354247efd Support Alpine Linux iptables 2017-02-21 17:03:48 -08:00
Tom Williams
c3efbbaf84 Fix a couple of small-ish issues in salt/states/boto3_route53.py (#39522) 
* INFRA-1963 - bad logic when checking if an update is due

* INFRA-1963 - only pass VPC related params if they're valid
 2017-02-21 17:07:13 -07:00
Nicole Thomas
836d2a08d0 Merge pull request #39541 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-21 16:56:04 -07:00
Mike Place
40f72db53e Merge pull request #39536 from twangboy/fix_win_status 
Namespace 'status' functions in 'win_status'
 2017-02-21 16:45:31 -07:00