Bo Maryniuk
|
28072c9e41
|
Adjust the test so it is using the right grain for SUSE systems
|
2017-04-24 16:08:22 +02:00 |
|
Bo Maryniuk
|
7a0e4be4f8
|
Add unit test for get_zone and various platforms
|
2017-04-24 16:08:22 +02:00 |
|
Mike Place
|
25b62aee47
|
Merge pull request #40817 from isbm/isbm-skip-false-values-from-preferred-ip-201611
Some UT for cloud
|
2017-04-23 04:01:40 -06:00 |
|
Bo Maryniuk
|
7c5714b90b
|
Describe debug information
|
2017-04-22 10:45:21 +02:00 |
|
Bo Maryniuk
|
e0210ff8cb
|
Reformat idents, fix typos
|
2017-04-22 10:45:08 +02:00 |
|
Bo Maryniuk
|
fb777e3f3e
|
PEP8: fix unused variable
|
2017-04-22 10:44:20 +02:00 |
|
Bo Maryniuk
|
b2e85de85d
|
Fix lint, typos and readability
|
2017-04-22 10:19:05 +02:00 |
|
Bo Maryniuk
|
116c96a4b7
|
Fix UT parameter changes
|
2017-04-22 10:08:20 +02:00 |
|
Bo Maryniuk
|
61558f08e7
|
Lintfix E0602
|
2017-04-22 10:08:20 +02:00 |
|
Bo Maryniuk
|
ed84420df0
|
Add unit test for node ip filtering
|
2017-04-22 10:08:20 +02:00 |
|
Bo Maryniuk
|
82582cff77
|
Skip test, if libcloud is not around
|
2017-04-22 10:08:20 +02:00 |
|
Bo Maryniuk
|
f005d53c56
|
Fix name error exception
|
2017-04-22 10:08:20 +02:00 |
|
Bo Maryniuk
|
b668e60b4c
|
Move out nested function for testing purposes
|
2017-04-22 10:08:19 +02:00 |
|
Bo Maryniuk
|
5e574a24d9
|
Add unit test for nova connector
|
2017-04-22 10:08:19 +02:00 |
|
Bo Maryniuk
|
181d0780d0
|
Lintfix
|
2017-04-22 10:08:19 +02:00 |
|
Bo Maryniuk
|
8e9ce1a68d
|
Move out nested function to be unit-testable
|
2017-04-22 10:08:19 +02:00 |
|
Bo Maryniuk
|
cd43805770
|
Add initial unit test for openstack cloud module
|
2017-04-22 10:08:19 +02:00 |
|
Bo Maryniuk
|
177f31446d
|
Add fake preferred IP function for testing
|
2017-04-22 10:08:19 +02:00 |
|
Bo Maryniuk
|
d1aeb13ac7
|
Move out openstack's nested function to be testable
|
2017-04-22 10:03:46 +02:00 |
|
Nicole Thomas
|
50ddf219a6
|
Merge pull request #40824 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
|
2017-04-21 14:03:10 -06:00 |
|
Mike Place
|
b5f67f0750
|
Merge pull request #40822 from lordcirth/fix-rsync-changes
rsync.py: Don't return changes when clean
|
2017-04-21 12:00:38 -06:00 |
|
Mike Place
|
1b304bb476
|
Extra space before inline comment
|
2017-04-21 11:47:02 -06:00 |
|
Mike Place
|
d6e26d18cb
|
Merge pull request #40811 from UtahDave/2016.11local
get config_dir based off conf_file if __opts__['config_dir'] doesn't exist
|
2017-04-21 11:44:41 -06:00 |
|
Mike Place
|
ddedf05b7d
|
Merge pull request #40820 from gtmanfred/2016.11
remove deprecated firstgen rackspace cloud driver
|
2017-04-21 11:42:18 -06:00 |
|
rallytime
|
f31f9512b8
|
Merge branch '2016.3' into '2016.11'
No conflicts.
|
2017-04-21 09:51:31 -06:00 |
|
Nathan Fish
|
ea4592de91
|
rsync.py: Don't return changes when clean
No longer returns changes when they are "N/A"
Fixes https://github.com/saltstack/salt/issues/37714
|
2017-04-21 11:27:54 -04:00 |
|
Daniel Wallace
|
b60a8d013a
|
remove rackspace from index
|
2017-04-21 09:23:05 -06:00 |
|
Daniel Wallace
|
559aa1d8b6
|
remove deprecated firstgen rackspace cloud driver
|
2017-04-21 08:59:56 -06:00 |
|
David Boucha
|
9f6e2e9c92
|
get config_dir based off conf_file
get config_dir based off conf_file if config_dir not in __opts__
ZD 1353
|
2017-04-20 17:20:19 -06:00 |
|
Nicole Thomas
|
2ab42489df
|
Merge pull request #40797 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
|
2017-04-20 13:42:03 -06:00 |
|
Nicole Thomas
|
ced839f841
|
Merge pull request #40800 from rallytime/bp-40720
Back-port #40720 to 2016.11
|
2017-04-20 13:41:40 -06:00 |
|
Ken Crowell
|
6c0124ae21
|
Call tornado.httputil.url_concat compatibly
See https://github.com/tornadoweb/tornado/pull/1899.
|
2017-04-20 11:37:20 -06:00 |
|
rallytime
|
22500a7261
|
Merge branch '2016.3' into '2016.11'
Conflicts:
- salt/utils/s3.py
|
2017-04-20 11:18:43 -06:00 |
|
Mike Place
|
3b9ebeb98f
|
Merge pull request #40754 from lordcirth/fix-uppercase-checksums
file.manage_file: uppercase checksums now work
|
2017-04-20 11:17:49 -06:00 |
|
Mike Place
|
5388ffa7a2
|
Merge pull request #40785 from alexproca/backport-winexec-selection
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
|
2017-04-20 10:45:13 -06:00 |
|
Mike Place
|
623e2eb61f
|
Merge pull request #40791 from a-powell/s3-util-get-memory-fix
S3 util get memory fix
|
2017-04-20 10:32:26 -06:00 |
|
Mike Place
|
f0f135c71d
|
Merge pull request #40796 from terminalmage/fix-nodegroup-docs
Fix inaccurate nodegroup docs
|
2017-04-20 10:08:21 -06:00 |
|
Erik Johnson
|
f99259a6eb
|
Fix inaccurate nodegroup docs
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
|
2017-04-20 10:07:19 -05:00 |
|
Alex Powell
|
36f6521014
|
Merge remote-tracking branch 'upstream/2016.3' into s3-util-get-memory-fix
|
2017-04-20 13:23:14 +01:00 |
|
Alex Powell
|
04637cd4eb
|
Fixing objects being loaded into memory when performing a GET request with a local file specified.
|
2017-04-20 13:22:29 +01:00 |
|
Alex Proca
|
91cafd5094
|
Add option to select 32 or 64 version of msiexec
Pass path to msiexec overloading msiexec parameter
|
2017-04-20 12:25:52 +03:00 |
|
Mike Place
|
c80c792704
|
remove too many newlines for lint
|
2017-04-19 15:42:57 -06:00 |
|
Nicole Thomas
|
d8f78550d9
|
Merge pull request #40769 from rallytime/bp-40760
Back-port #40760 to 2016.11
|
2017-04-19 14:23:21 -06:00 |
|
Jeffrey 'jf' Lim
|
71ac15fc4c
|
Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'!
|
2017-04-19 12:04:51 -06:00 |
|
rallytime
|
85dc4164f5
|
Don't change the salt.utils.jinja yaml Dumper class
This is already handled in the yaml template class.
|
2017-04-19 11:58:31 -06:00 |
|
Nicole Thomas
|
61f8de43df
|
Merge pull request #40756 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
|
2017-04-19 11:47:50 -06:00 |
|
rallytime
|
0e087323f1
|
Merge branch '2016.3' into '2016.11'
No conflicts.
|
2017-04-18 16:41:22 -06:00 |
|
Nathan Fish
|
a7d8f375e8
|
file.manage_file: uppercase checksums now work
fixes #38914
|
2017-04-18 18:10:31 -04:00 |
|
rallytime
|
4fe6ac93c6
|
Add extra line for lint
|
2017-04-18 15:02:29 -06:00 |
|
CEG
|
4a70b8c0cc
|
fixing minor error in security_groups
security groups parser had incorrect split action which caused errors
|
2017-04-18 15:00:35 -06:00 |
|