denza
a753f641c4
Merge
2017-12-25 05:52:55 +01:00
denza
2cb5f059a2
Pylint violations fixes
2017-12-25 05:46:05 +01:00
Gareth J. Greenaway
49a0c20de2
Merge pull request #45150 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 10
2017-12-22 15:27:55 -08:00
rallytime
d9c23ef6df
Reduce the number of days an issue is stale by 10
2017-12-22 16:52:19 -05:00
Nicole Thomas
9579298a36
Merge pull request #45060 from mbologna/v2016.11.4-all-fqdns
...
Add fqdns grain to list all known FQDNs
2017-12-22 15:39:26 -05:00
Nicole Thomas
5989618eef
Merge pull request #45048 from pkruk/extendig-parted-with-ext4
...
Extend parted with ext3 and ext4 partition type
2017-12-22 14:01:26 -05:00
Nicole Thomas
c6406e8c27
Merge pull request #45103 from jasperla/openbsdpkg/latest_version
...
openbsdpkg.latest_version: correctly handle installed packages
2017-12-22 13:57:53 -05:00
Nicole Thomas
668b0023e5
Merge pull request #45132 from rallytime/merge-develop
...
[develop] Merge forward from oxygen to develop
2017-12-22 13:57:10 -05:00
Nicole Thomas
dafb42fd92
Merge pull request #45051 from AAbouZaid/defaults_update
...
Add defaults.update function.
2017-12-22 13:13:02 -05:00
Nicole Thomas
0f8f5074ec
Merge pull request #44922 from dincamihai/develop
...
Fix salt-master for old psutil
2017-12-22 13:05:30 -05:00
Nicole Thomas
2fde5c5d83
Merge pull request #45106 from jasperla/openbsdpkg/purge
...
openbsdpkg.purge: fully purge packages
2017-12-22 13:03:27 -05:00
Nicole Thomas
c40250eb69
Merge pull request #45116 from arif-ali/sdb_rest_fix
...
fix adding parameters to http.query from sdb yaml
2017-12-22 12:54:42 -05:00
Nicole Thomas
90a928e9ab
Merge pull request #45089 from jbadson/add-scaleway-ssh-key-support
...
Added salt-cloud support for ssh keys with Scaleway.
2017-12-22 10:35:49 -05:00
Michele Bologna
81ad8a3933
Tests: make tests robust
2017-12-22 11:37:46 +01:00
denza
3407b272c0
ProfitBricks CloudAPI v4 updates
2017-12-22 05:38:46 +01:00
Michele Bologna
f0996a6620
Tests: add tests
2017-12-21 22:48:54 +01:00
Michele Bologna
fa69c7117a
Style: PEP8
2017-12-21 22:48:48 +01:00
Michele Bologna
2c682a8727
Feat: add grain for all FQDNs
2017-12-21 22:48:37 +01:00
Piotr
2f2f6c3ea7
Merge branch 'develop' into extendig-parted-with-ext4
2017-12-21 22:20:24 +01:00
rallytime
4fada1f3c2
Merge branch 'oxygen' into 'develop'
...
No conflicts.
2017-12-21 16:03:21 -05:00
Nicole Thomas
67df35ecd3
Merge pull request #44984 from garethgreenaway/scheduler_fixes_loop_interval
...
[oxygen] scheduler loop interval fixes
2017-12-21 15:11:09 -05:00
Jim Adson
8513948955
Fixed missing import of SaltCloudConfigError.
2017-12-21 11:42:19 -07:00
Gareth J. Greenaway
98a9ddf10c
Merge branch 'oxygen' into scheduler_fixes_loop_interval
2017-12-21 08:36:09 -08:00
Arif Ali
f72455d83a
fix adding parameters to http.query from sdb yaml
2017-12-21 16:15:00 +00:00
Jasper Lievisse Adriaanse
70296569d0
openbsdpkg.purge: fully purge packages
...
'purge' is now no longer an alias for 'remove' and instead removes
files marked as @extra and all other configuration files.
2017-12-21 17:11:03 +01:00
Jasper Lievisse Adriaanse
27d8772384
openbsdpkg.latest_version: correctly handle installed packages
...
before it wouldn't return anything if the package was already installed,
even if there was an update available in the upstream repository.
before:
salt: ~ # salt-ssh llama pkg.latest_version borgbackup
llama:
salt: ~ #
after:
salt: ~ # salt-ssh llama pkg.latest_version borgbackup
llama:
1.1.3
salt: ~ #
2017-12-21 17:09:47 +01:00
Nicole Thomas
43f58f9340
Merge pull request #44953 from gtmanfred/develop
...
Update kitchen for oxygen release (develop)
2017-12-21 10:11:09 -05:00
Nicole Thomas
7dd4255ab4
Merge pull request #45115 from twangboy/win_fix_pyzmq
...
Set pyzmq version to 16.0.3
2017-12-21 09:36:16 -05:00
Nicole Thomas
139a024ae2
Merge pull request #45120 from jasperla/tyop
...
fix two trivial typos
2017-12-21 09:12:33 -05:00
Nicole Thomas
94ee4510fc
Merge pull request #45117 from twangboy/win_update_nsis
...
Update to NSIS 3.02.1
2017-12-21 09:08:20 -05:00
Jasper Lievisse Adriaanse
b4bed3d301
fix two trivial typos
2017-12-21 10:11:43 +01:00
Piotr
841c05079b
Merge branch 'develop' into extendig-parted-with-ext4
2017-12-21 07:59:39 +01:00
twangboy
91d343d744
Update to NSIS 3.02.1
2017-12-20 15:56:05 -07:00
twangboy
c28b7d4710
Roll back pyzmq req to 16.0.3
2017-12-20 15:41:56 -07:00
Nicole Thomas
21de54de44
Merge pull request #45105 from rallytime/utils-path-update
...
Update old utils paths to new paths
2017-12-20 17:22:29 -05:00
Nicole Thomas
06579a3e1b
Merge pull request #45102 from rallytime/merge-develop
...
[develop] Merge forward from oxygen to develop
2017-12-20 17:15:57 -05:00
Nicole Thomas
11a192351a
Merge pull request #45021 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 10
2017-12-20 11:32:08 -05:00
Nicole Thomas
b9503a46af
Merge pull request #45085 from rallytime/43296-follow-up
...
Version added update for new boto_s3 module and state
2017-12-20 11:30:11 -05:00
Erik Johnson
67769b8ad6
Merge pull request #45101 from rallytime/bp-45062
...
Back-port #45062 to oxygen
2017-12-20 08:41:52 -06:00
rallytime
ec2a32a106
Update old utils paths to new paths
2017-12-20 08:03:14 -05:00
rallytime
2862099f7c
Merge branch 'oxygen' into 'develop'
...
No conflicts.
2017-12-20 07:02:07 -05:00
Michael Calmer
744e698689
adapt tests to reflect reality
...
When CherryPy run with python3 it reads "bytes" from the wire.
In case of python2 BytesIO == StringIO, so nothing should change.
This change will do the same to make unit tests reflect reality.
2017-12-20 06:59:56 -05:00
Michael Calmer
9fa126f664
cherrypy read() reads bytes from the wire and write them into contents var
2017-12-20 06:59:49 -05:00
Nicole Thomas
d42b98a777
Merge pull request #45062 from mcalmer/fix-cherrypy-with-py3
...
Fix cherrypy with py3
2017-12-20 06:48:13 -05:00
Nicole Thomas
dafd2fc61f
Merge pull request #45083 from Ch3LL/gce_test_fix
...
Force gce cloud test name to be lowercase
2017-12-20 06:46:23 -05:00
Nicole Thomas
19997e4d81
Merge pull request #45092 from terminalmage/fix-pip-test
...
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
2017-12-20 05:52:08 -05:00
Piotr
ec309afeff
Merge branch 'develop' into extendig-parted-with-ext4
2017-12-20 10:15:33 +01:00
Nicole Thomas
b1dc0de02f
Merge pull request #45038 from terminalmage/fix-missing-exc
...
docker_image: Fix missing exc in except, pass proper args to docker.build
2017-12-19 19:50:21 -05:00
Erik Johnson
109c9936d3
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
...
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-19 18:37:59 -06:00
Erik Johnson
7a60cfd171
Clear Python 2 .pyc files when Python 3 suite runs
...
This prevents import errors when Python 2 .pyc files exist and the test
suite is run under Python 3.
2017-12-19 15:35:10 -06:00
