Nicole Thomas
|
bebc33daf5
|
Merge pull request #44295 from HeinleinSupport/issue44272
fixes issue #44272
|
2017-10-27 10:28:57 -04:00 |
|
Robert Sander
|
f972715a45
|
fixes issue #44272
The method stop() in the state module win_service fails if the service has already been stopped.
|
2017-10-26 10:52:19 +02:00 |
|
Mike Place
|
e7ca9f8407
|
Merge pull request #44286 from gtmanfred/2016.11
use our git repo for kitchen-salt
|
2017-10-25 21:27:32 +02:00 |
|
Daniel Wallace
|
193e715e37
|
use our git repo for kitchen-salt
|
2017-10-25 11:15:17 -06:00 |
|
Mike Place
|
8a1ea165af
|
Merge pull request #44259 from gtmanfred/2016.11
begin switching in kitchen-salt for running the test suite
|
2017-10-25 15:30:34 +02:00 |
|
Mike Place
|
9d6bc8509b
|
Merge pull request #44268 from twangboy/win_fix_lgpo_typo
Fix typo
|
2017-10-25 15:01:34 +02:00 |
|
Mike Place
|
0beb65a283
|
Merge pull request #44269 from terminalmage/fix-log-message
Fix log message in salt.utils.gitfs
|
2017-10-25 15:00:57 +02:00 |
|
Erik Johnson
|
bc9cd65496
|
Fix log message in salt.utils.gitfs
This needed to be using the config overlay function and not referencing
the attribute directly.
|
2017-10-24 17:36:29 -05:00 |
|
twangboy
|
a6a4c10a77
|
Fix typo
|
2017-10-24 15:35:40 -06:00 |
|
Daniel Wallace
|
56a3ad8f68
|
fix pylint comments
|
2017-10-24 12:18:27 -06:00 |
|
Daniel Wallace
|
4add666db1
|
add comment to Gemfile and move copyartifacts
moved copyartifacts.py to tests/support
Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt
|
2017-10-24 12:01:57 -06:00 |
|
Daniel Wallace
|
b4c8f7eb57
|
fix pylint
|
2017-10-24 10:44:25 -06:00 |
|
Daniel Wallace
|
392fd4f837
|
try newest salttesting
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
79251287d0
|
add logging
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
38963d5a82
|
use transport if not set in state_file
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
10e309a64f
|
which vagrant should go to stderr
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
9307564de0
|
fix output columns
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
2da22f87e1
|
test opennebula
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
9f38f16905
|
add opennebula to Gemfile
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
7465f9b27a
|
add script for copying back artifacts
|
2017-10-24 09:23:46 -06:00 |
|
Daniel Wallace
|
255118cfd7
|
run tests with kitchen
|
2017-10-24 09:23:44 -06:00 |
|
Nicole Thomas
|
304dd2529d
|
Merge pull request #44160 from gtmanfred/directory
add changes to test return
|
2017-10-23 10:35:20 -04:00 |
|
Erik Johnson
|
e10395483d
|
Merge pull request #44205 from rallytime/bp-44177
Back-port #44177 to 2016.11
|
2017-10-23 09:09:06 -05:00 |
|
Senthilkumar Eswaran
|
b9940f8521
|
Fixing default redis.host in documentation
|
2017-10-20 10:55:41 -04:00 |
|
Nicole Thomas
|
09ddfd0c08
|
Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes
Fixes to modules/debian_ip
|
2017-10-20 10:25:38 -04:00 |
|
Daniel Wallace
|
a7d3d668f4
|
missed removing changes in the next test
|
2017-10-20 08:11:44 -06:00 |
|
Mike Place
|
9f9e936b52
|
Merge pull request #43830 from rallytime/bp-43644
Back-port #43644 to 2016.11
|
2017-10-19 17:57:50 -05:00 |
|
Mike Place
|
07db6a3d8b
|
Merge pull request #43994 from oeuftete/fix-manage-runner-presence
Fix manage.present to show lost minions
|
2017-10-19 17:27:58 -05:00 |
|
Mike Place
|
a07537e258
|
Merge pull request #44188 from terminalmage/issue44150
yumpkg: Check pkgname instead of name to see if it is a kernel pkg
|
2017-10-19 17:20:34 -05:00 |
|
Mike Place
|
715edc0cea
|
Merge pull request #44158 from rallytime/bp-44089
Back-port #44089 to 2016.11
|
2017-10-19 15:38:14 -05:00 |
|
Erik Johnson
|
0692f442db
|
yumpkg: Check pkgname instead of name to see if it is a kernel pkg
We should have been checking pkgname instead of name all along, but this
never bit us until 6638749 started passing `None` for the name param.
|
2017-10-19 13:54:03 -05:00 |
|
Daniel Wallace
|
ac0b5ec440
|
fix test
|
2017-10-19 09:28:59 -06:00 |
|
Gareth J. Greenaway
|
5f7555846f
|
When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable.
|
2017-10-18 12:51:29 -07:00 |
|
Daniel Wallace
|
d3d00c3e62
|
add changes to test return
|
2017-10-18 11:25:44 -06:00 |
|
Vasili Syrakis
|
534faf0b7a
|
Catch on empty Virtualbox network addr #43427
|
2017-10-18 13:00:25 -04:00 |
|
Ken Crowell
|
f3980d7d83
|
Fix manage.present to show lost minions
Fixes #38367 and and #43936.
|
2017-10-17 21:43:21 -03:00 |
|
Nicole Thomas
|
0cd493b691
|
Merge pull request #44131 from rallytime/bp-44029
Back-port #44029 to 2016.11
|
2017-10-17 11:05:38 -04:00 |
|
Matthew Summers
|
bebf301976
|
fixed test addressing issue #43307, disk.format_ to disk.format
|
2017-10-16 16:35:57 -04:00 |
|
Matthew Summers
|
b4ba7ae2fc
|
addresses issue #43307, disk.format_ to disk.format
This change fixes breakage. It appears the disk.format_ func is
aliased to disk.format in modules/disk.py
|
2017-10-16 16:35:18 -04:00 |
|
Mike Place
|
3a68e356f8
|
Merge pull request #44093 from gtmanfred/fix-44087
don't filter if return is not a dict
|
2017-10-16 13:13:18 -06:00 |
|
Nicole Thomas
|
c785d7a847
|
Merge pull request #44122 from cachedout/gpg_pr_template
Add note about GPG signing to PR template
|
2017-10-16 15:09:37 -04:00 |
|
Nicole Thomas
|
bf90ea1f51
|
Merge pull request #44124 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.11.8 to 2016.11
|
2017-10-16 15:07:13 -04:00 |
|
Mike Place
|
e41e3d76be
|
Typo fix
|
2017-10-16 13:00:11 -06:00 |
|
Nicole Thomas
|
13f3ffa83a
|
Merge pull request #44097 from gtmanfred/openneb
OpenNebula does not require the template_id to be specified
|
2017-10-16 14:36:16 -04:00 |
|
rallytime
|
59861291c8
|
Merge branch '2016.11.8' into '2016.11'
No conflicts.
|
2017-10-16 13:29:07 -04:00 |
|
Mike Place
|
37c7980880
|
Add note about GPG signing to PR template
|
2017-10-16 10:03:02 -06:00 |
|
Mike Place
|
ac3e4df964
|
Merge pull request #44110 from roaldnefs/fix-doc-local-returner
Format fix code example local returner doc
|
2017-10-16 09:57:49 -06:00 |
|
Roald Nefs
|
efd58f7594
|
Merge branch '2016.11' into fix-doc-local-returner
|
2017-10-16 16:29:22 +02:00 |
|
Roald Nefs
|
881f1822f2
|
Format fix code example local returner doc
|
2017-10-14 20:05:30 +02:00 |
|
Daniel Wallace
|
c29655b2c2
|
Merge branch '2016.11' into openneb
|
2017-10-13 19:36:07 -06:00 |
|