 rallytime
|
caa8fc9169
Merge branch '2016.3' into 'carbon'
|
%!s(int64=8) %!d(string=hai) anos |
|
Nicole Thomas
|
2bc5dedd06
Allow the minion test daemons a couple of tries to connect to the master (#37150)
|
%!s(int64=8) %!d(string=hai) anos |
|
Daniel Wallace
|
1c31d5e464
add keystone state integration tests
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
47fb8379d7
Remove hosts and aliases from sub_minion conf
|
%!s(int64=8) %!d(string=hai) anos |
|
Mike Place
|
5f5d7193b0
Add interface to all configs
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
4e56d28993
Add tcp_master settings to both masters
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
3833c008b2
Cleans up config parameters
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
c1ae2537f1
Remove configuration from configs
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
a33c5c15da
Fix master and sub_minion configs
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
f55ba87bee
Fix configs, remove default values
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
9b14dc0a6e
Add Pedro's suggestions
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
1805630fdc
Fix integration tests on windows
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
f7fb4985c4
Add Pedro's suggestions
|
%!s(int64=8) %!d(string=hai) anos |
|
twangboy
|
5bcb27e477
Fix integration tests on windows
|
%!s(int64=8) %!d(string=hai) anos |
|
Pedro Algarvio
|
3adf8e286e
Some more test suite run fixes
|
%!s(int64=8) %!d(string=hai) anos |
|
Pedro Algarvio
|
7a8460856c
Define IDs and ports on sample configs
|
%!s(int64=8) %!d(string=hai) anos |
|
Erik Johnson
|
77eeb47bea
Add tests for nested grain/pillar matching
|
%!s(int64=12) %!d(string=hai) anos |
|
Pedro Algarvio
|
ac1fe9810a
Point `hosts.file` and `aliases.file` to the new tests temporary dir.
|
%!s(int64=12) %!d(string=hai) anos |
|
Pedro Algarvio
|
accb15d6ee
Add tests for saltstack/salt#1900
|
%!s(int64=12) %!d(string=hai) anos |
|
Thomas S Hatch
|
e446a306c7
Add sock_dir verification to tests
|
%!s(int64=12) %!d(string=hai) anos |
|
Thomas S Hatch
|
c9cddd2245
Add second minion to tests
|
%!s(int64=12) %!d(string=hai) anos |
