Pedro Algarvio
|
5f9764a93f
|
Merge pull request #51678 from Ch3LL/merge-2019.2.0.rc
[2019.2] Merge forward from 2019.2.0.rc1 to 2019.2
|
2019-02-17 19:02:32 +00:00 |
|
Gareth J. Greenaway
|
f8372ca2bf
|
Merge branch '2019.2' into merge-2019.2.0.rc
|
2019-02-15 16:32:15 -08:00 |
|
Gareth J. Greenaway
|
2036c8aaf8
|
Merge pull request #51679 from Ch3LL/bp-51383
Backport #51383 into 2019.2
|
2019-02-15 16:31:05 -08:00 |
|
Jorge Schrauwen
|
e4971fcabd
|
imgadm module should deal with invalid images better
|
2019-02-15 16:01:21 -05:00 |
|
Ch3LL
|
58f2407331
|
Merge branch '2019.2.0.rc1' into 2019.2
Conflicts:
- tests/integration/__init__.py
|
2019-02-15 15:53:57 -05:00 |
|
Daniel Wozniak
|
1ea6f4b18b
|
Merge pull request #51658 from dwoz/pip_test_fix
[2019.2] Let memcopy make the null bytes, better py3 support
|
2019-02-14 22:42:36 -07:00 |
|
Daniel A. Wozniak
|
c811a70907
|
Let memcopy make the null bytes, better py3 support
|
2019-02-14 19:32:32 -07:00 |
|
Shane Lee
|
22a04c1287
|
Merge pull request #51650 from dwoz/increase_wait_2019.2
[2019.2] Increase minion wait for slow boxes
|
2019-02-14 09:31:58 -07:00 |
|
Shane Lee
|
ad294f30a2
|
Merge branch '2019.2' into increase_wait_2019.2
|
2019-02-14 09:31:41 -07:00 |
|
Shane Lee
|
a0982f74f4
|
Merge pull request #51645 from dwoz/batch_exit_2019.2
[2019.2] increase batch test timeout on windows
|
2019-02-14 09:29:25 -07:00 |
|
Shane Lee
|
1a882d7fc0
|
Merge branch '2019.2' into batch_exit_2019.2
|
2019-02-14 09:29:12 -07:00 |
|
Gareth J. Greenaway
|
705a62de7b
|
Merge pull request #51586 from garethgreenaway/merge-2018.3
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-02-14 08:25:28 -08:00 |
|
Daniel A. Wozniak
|
a5af9c5388
|
Increase minion wait for slow boxes
|
2019-02-14 02:04:35 -07:00 |
|
Daniel A. Wozniak
|
4b11d6bb5c
|
increase batch test timeout on windows
|
2019-02-14 01:34:01 -07:00 |
|
Megan Wilhite
|
0ca04ffbeb
|
Merge pull request #51627 from twangboy/fix_lgpo_2019.2.0
Use makedirs instead of mkdir
|
2019-02-13 14:44:47 -05:00 |
|
Daniel Wozniak
|
41a581c489
|
Merge pull request #51624 from dwoz/wait_minions_rc1
[2019.2.0.rc1] Wait for minions to be pingable before starting tests
|
2019-02-13 12:43:59 -07:00 |
|
Gareth J. Greenaway
|
09fb3e7fc5
|
Merge branch '2019.2' into merge-2018.3
|
2019-02-13 10:32:21 -08:00 |
|
twangboy
|
5a90b30589
|
Use makedirs instead of mkdir
|
2019-02-13 11:25:29 -07:00 |
|
Daniel Wozniak
|
e7ee04e6d5
|
Merge pull request #51549 from s0undt3ch/2019.2
[2019.2] Allow NOT to install pip dependencies
|
2019-02-13 11:16:51 -07:00 |
|
Daniel A. Wozniak
|
22d31539c4
|
fix linter
|
2019-02-13 11:06:42 -07:00 |
|
Daniel A. Wozniak
|
9a4ea8f8ab
|
Wait for minions to be pingable before starting tests
|
2019-02-13 11:06:20 -07:00 |
|
Daniel Wozniak
|
c96464be56
|
Merge pull request #51595 from mirceaulinic/mircea/port-824e0e5
Fix ipaddress imports
|
2019-02-13 10:33:08 -07:00 |
|
Megan Wilhite
|
6a406b7f97
|
Merge pull request #51614 from twangboy/fix_51566_2019.2.0
Handle explicit lists properly
|
2019-02-13 12:09:33 -05:00 |
|
Daniel Wozniak
|
95c505a1fa
|
Merge branch '2019.2' into merge-2018.3
|
2019-02-13 06:28:11 -07:00 |
|
Pedro Algarvio
|
d2125aa38b
|
Allow NOT to install pip dependencies
|
2019-02-13 12:09:14 +00:00 |
|
Daniel Wozniak
|
e3c9a3e66c
|
Merge pull request #51517 from damianosSemmle/fix-string-format-index
Fixed string format index out of range error
|
2019-02-13 01:18:37 -07:00 |
|
Daniel Wozniak
|
4abd9d0462
|
Merge branch '2019.2' into merge-2018.3
|
2019-02-13 01:12:52 -07:00 |
|
Daniel Wozniak
|
c0959e2b1c
|
Merge branch '2019.2' into fix-string-format-index
|
2019-02-12 21:34:23 -07:00 |
|
Daniel Wozniak
|
82500bbc32
|
Merge pull request #51581 from garethgreenaway/merge-2019.2.0rc1
[2019.2] Merge forward from 2019.2.0rc1 to 2019.2
|
2019-02-12 21:11:15 -07:00 |
|
Daniel Wozniak
|
b00e7e8b09
|
Merge branch '2019.2' into merge-2019.2.0rc1
|
2019-02-12 17:55:02 -07:00 |
|
Daniel Wozniak
|
91bcb4fa31
|
Merge branch '2019.2' into mircea/port-824e0e5
|
2019-02-12 17:49:50 -07:00 |
|
Daniel Wozniak
|
edb5e942db
|
Merge pull request #51607 from dwoz/wait_minions_2019.2
[2019.2] Wait for minions to be pingable before starting tests
|
2019-02-12 17:48:46 -07:00 |
|
twangboy
|
abb46d3ed0
|
Handle explicit lists properly
|
2019-02-12 14:49:18 -07:00 |
|
Daniel A. Wozniak
|
ab0a6a38e5
|
fix linter
|
2019-02-12 12:04:37 -07:00 |
|
Daniel A. Wozniak
|
f2e4a30916
|
Wait for minions to be pingable before starting tests
|
2019-02-12 12:04:34 -07:00 |
|
Daniel Wozniak
|
1e0275eea3
|
Merge pull request #51584 from dwoz/script_fixes
[2019.2] Use the code directory instead of cwd for python path
|
2019-02-12 11:43:45 -07:00 |
|
Megan Wilhite
|
1e9a37f818
|
Merge pull request #51536 from twangboy/fix_51309_2019.2.0.rc1
Convert data to string using salt util (2019.2.0.rc1)
|
2019-02-12 13:11:27 -05:00 |
|
Bo Maryniuk
|
84fc76d177
|
Fix ipaddress imports
|
2019-02-12 11:18:45 +00:00 |
|
damianosSemmle
|
ac73745e15
|
Merge branch '2019.2' into fix-string-format-index
|
2019-02-12 10:18:09 +00:00 |
|
Gareth J. Greenaway
|
6c99cb161f
|
Merge branch '2018.3' into merge-2018.3
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-proxy.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
doc/man/spm.1
pkg/osx/build_env.sh
salt/utils/dns.py
tests/integration/netapi/rest_tornado/test_app.py
tests/support/case.py
tests/unit/utils/test_dns.py
|
2019-02-11 15:45:43 -08:00 |
|
Gareth J. Greenaway
|
41e25a6627
|
Merge pull request #51580 from garethgreenaway/merge-2018.3.4
[2018.3] Merge forward from 2018.3.4 to 2018.3
|
2019-02-11 14:35:33 -08:00 |
|
Daniel A. Wozniak
|
dbf4356aac
|
Use the code directory instead of cwd for python path
|
2019-02-11 14:47:19 -07:00 |
|
Daniel Wozniak
|
cd24006882
|
Merge branch '2019.2' into merge-2019.2.0rc1
|
2019-02-11 14:40:49 -07:00 |
|
Daniel Wozniak
|
f446c52584
|
Merge pull request #51583 from dwoz/scriptfix
Add testing path to run_script commands
|
2019-02-11 14:38:50 -07:00 |
|
Daniel A. Wozniak
|
e49ba862cf
|
Add testing path to run_script commands
|
2019-02-11 14:13:25 -07:00 |
|
Megan Wilhite
|
45a11e30ec
|
Merge branch '2019.2.0.rc1' into fix_51309_2019.2.0.rc1
|
2019-02-11 15:26:03 -05:00 |
|
Megan Wilhite
|
634ce48d1c
|
Merge pull request #51545 from twangboy/fix_test_ssh_2019.2.0.rc1
Fix ssh for Windows (2019.2.0.rc1)
|
2019-02-11 15:25:26 -05:00 |
|
Gareth J. Greenaway
|
6e55164416
|
Merge branch '2019.2.0.rc1' into merge-2019.2.0rc1
Conflicts:
Gemfile
|
2019-02-11 11:27:20 -08:00 |
|
Gareth J. Greenaway
|
84e15cedf9
|
Fixing lint
|
2019-02-11 10:57:08 -08:00 |
|
Gareth J. Greenaway
|
e891b3f515
|
Merge branch '2018.3.4' into merge-2018.3.4
Conflicts:
tests/integration/states/test_file.py
tests/unit/states/test_file.py
tests/unit/utils/test_dns.py
|
2019-02-11 10:46:53 -08:00 |
|