Nicole Thomas
|
54d29a61cb
|
Merge pull request #44787 from rallytime/groupadd-destructive-clean
GroupAdd test: Add destructive test decorator to entire class
|
2017-12-11 13:14:17 -05:00 |
|
Nicole Thomas
|
0292e3612a
|
Merge pull request #44895 from mvivaldi/filters-doc
Jinja Filters doc
|
2017-12-11 10:32:06 -05:00 |
|
Nicole Thomas
|
df28f312ac
|
Merge pull request #44879 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
|
2017-12-10 11:53:43 -05:00 |
|
mvivaldi
|
62409d608a
|
Added Escape Filters and Set Theory Filters in jinja documentation
|
2017-12-09 09:48:55 +01:00 |
|
Nicole Thomas
|
8e14bc3941
|
Merge pull request #44880 from UtahDave/2017.7local
Determine windows hardware arch correctly
|
2017-12-08 17:24:08 -05:00 |
|
David Boucha
|
6e3c7ac1ac
|
Merge branch '2017.7' into 2017.7local
|
2017-12-08 12:01:03 -07:00 |
|
Nicole Thomas
|
dc51174670
|
Merge pull request #44861 from twangboy/win_fix_lgpo_invalid_value
Fix win_lgpo for unknown values
|
2017-12-08 13:52:04 -05:00 |
|
Nicole Thomas
|
f5a143f8c5
|
Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7
Bugfix: errors in external pillar causes crash, instead of report of them
|
2017-12-08 13:46:55 -05:00 |
|
David Boucha
|
dae9c6aa5c
|
Determine windows hardware arch correctly
Also allow for setting path to arbitrary windows python environment
|
2017-12-07 15:42:07 -07:00 |
|
rallytime
|
23c5a4ca3e
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- salt/modules/win_pkg.py
- salt/states/file.py
- tests/integration/states/test_file.py
- tests/unit/states/test_file.py
|
2017-12-07 17:33:03 -05:00 |
|
Nicole Thomas
|
abe089ad54
|
Merge pull request #43379 from twangboy/win_fix_file.managed
Fix file.managed on Windows with test=True
|
2017-12-07 16:10:42 -05:00 |
|
Gareth J. Greenaway
|
cf4cbcd340
|
Merge pull request #44570 from gtmanfred/2017.7
Include client mixin globals in scheduler for runner modules
|
2017-12-07 12:23:32 -08:00 |
|
Gareth J. Greenaway
|
bb1f8dceaf
|
Merge pull request #44579 from roaldnefs/fix-cron-identifier
Fix bug in cron module and state - Fixes #44530
|
2017-12-07 12:18:26 -08:00 |
|
Gareth J. Greenaway
|
df73a4c051
|
Merge branch '2016.11' into fix-cron-identifier
|
2017-12-07 12:13:37 -08:00 |
|
Daniel Wallace
|
7b17f9f63c
|
Merge branch '2017.7' into 2017.7
|
2017-12-07 12:27:52 -07:00 |
|
Nicole Thomas
|
febb913743
|
Merge pull request #44494 from skizunov/develop2
Fix broken `beacons_before_connect` feature
|
2017-12-07 13:24:49 -05:00 |
|
Gareth J. Greenaway
|
edcd581ca5
|
Merge branch '2017.7' into win_fix_file.managed
|
2017-12-07 10:00:55 -08:00 |
|
Nicole Thomas
|
7adcfbf8ec
|
Merge branch '2017.7' into develop2
|
2017-12-07 10:14:52 -05:00 |
|
Nicole Thomas
|
284a817565
|
Merge pull request #44512 from rallytime/bp-44356
Back-port #44356 to 2017.7
|
2017-12-07 09:44:49 -05:00 |
|
Nicole Thomas
|
74ee7ce541
|
Merge pull request #44748 from twangboy/osx_fix_auto_login
Fix auto login support for OSX
|
2017-12-07 09:22:22 -05:00 |
|
Nicole Thomas
|
b60cca174c
|
Merge pull request #44842 from twangboy/win_fix_lgpo
Win fix lgpo unicode on Py3 issue
|
2017-12-07 09:21:13 -05:00 |
|
twangboy
|
89f65e19ff
|
Check for values other than 0 or 1
|
2017-12-06 17:36:47 -07:00 |
|
Nicole Thomas
|
bb58e2fec0
|
Merge pull request #44843 from twangboy/win_fix_lgpo_typo
Fix 2 typos in lgpo module
|
2017-12-06 12:56:43 -05:00 |
|
Nicole Thomas
|
af0131fa1f
|
Merge pull request #44852 from damon-atkins/2016.11_win_pkg_typo_n_fix
win_pkg fix spelling typos and minion option 2016.11
|
2017-12-06 11:49:16 -05:00 |
|
Nicole Thomas
|
0e7c19084f
|
Lint: Remove extra whitespace
|
2017-12-06 10:38:19 -05:00 |
|
Nicole Thomas
|
d6c37ea19c
|
Merge pull request #44827 from mz-bmcqueen/2017.7
add more clone options to virtualbox and add better dhcp handling
|
2017-12-06 10:02:22 -05:00 |
|
Damon Atkins
|
7c7e21f94d
|
Fix spelling typo, and fix backwards campatible minion option for repo location
|
2017-12-07 00:54:16 +11:00 |
|
twangboy
|
c8f93e6dd7
|
Fix 2 types, shorten line lengths for spellchecking
|
2017-12-05 16:14:43 -07:00 |
|
twangboy
|
efe77999d1
|
Gate log.debug statement behind successful pop
|
2017-12-05 15:44:51 -07:00 |
|
twangboy
|
1c0ec79cd1
|
Fix py3 issue
|
2017-12-05 15:44:51 -07:00 |
|
Nicole Thomas
|
019169ed61
|
Merge pull request #44824 from Ch3LL/spm_args
Add spm -y and -f arg integration tests
|
2017-12-05 16:49:31 -05:00 |
|
Ch3LL
|
d8f81d2e4d
|
fix pylint
|
2017-12-05 14:39:36 -05:00 |
|
Nicole Thomas
|
59b930668c
|
Merge pull request #44742 from Ch3LL/cloud_action_test
Add salt-cloud action rename integration test
|
2017-12-05 12:44:49 -05:00 |
|
mz-bmcqueen
|
4ead3014b7
|
Merge branch '2017.7' into 2017.7
|
2017-12-05 09:27:48 -08:00 |
|
Nicole Thomas
|
10442d9211
|
Merge pull request #44771 from garethgreenaway/42676_backport_44071
[2017.7] Back porting #44071
|
2017-12-05 12:16:05 -05:00 |
|
Nicole Thomas
|
23d151b40a
|
Merge pull request #44784 from rallytime/merge-2017.7-1
[2017.7] Merge forward from 2016.11 to 2017.7
|
2017-12-05 12:13:48 -05:00 |
|
Brian McQueen
|
b7ce154014
|
Merge branch '2017.7' of https://github.com/mz-bmcqueen/salt into 2017.7
|
2017-12-04 22:48:22 -08:00 |
|
Brian McQueen
|
c2018c9021
|
fix pylint complaints
|
2017-12-04 22:47:37 -08:00 |
|
mz-bmcqueen
|
2f80f431b3
|
Merge branch '2017.7' into 2017.7
|
2017-12-04 14:47:47 -08:00 |
|
Brian McQueen
|
c38ff74261
|
add more clone options to virtualbox and add better dhcp handling
|
2017-12-04 14:36:19 -08:00 |
|
Ch3LL
|
951d09ca2f
|
remove unnecessary try/except block
|
2017-12-04 16:18:01 -05:00 |
|
Ch3LL
|
c329ced7ee
|
Add salt-cloud action rename integration test
|
2017-12-04 16:16:08 -05:00 |
|
Ch3LL
|
61ac5cf157
|
Add spm -y and -f arg integration tests
|
2017-12-04 16:06:14 -05:00 |
|
twangboy
|
a27bb6993a
|
Fix py3 error
|
2017-12-04 14:05:54 -07:00 |
|
twangboy
|
0ff9fa498a
|
Fix test_directory
|
2017-12-04 14:05:54 -07:00 |
|
twangboy
|
187bc1e61e
|
Add back the try/finally blocks
|
2017-12-04 14:05:54 -07:00 |
|
twangboy
|
d7241d004f
|
Fix 2 more tests
|
2017-12-04 14:05:54 -07:00 |
|
twangboy
|
d5dd42aebe
|
Fix integration tests for Windows
|
2017-12-04 14:05:53 -07:00 |
|
twangboy
|
d56bc9aae9
|
Fix typo
|
2017-12-04 14:05:53 -07:00 |
|
twangboy
|
af5565859e
|
Use file functions for symlink and remove
|
2017-12-04 14:05:53 -07:00 |
|