rallytime
|
8479c45728
|
Merge branch '2016.3' into 'develop'
No conflicts.
|
2016-06-21 17:29:44 -06:00 |
|
rallytime
|
b061b86946
|
Merge branch '2015.8' into '2016.3'
No conflicts.
|
2016-06-20 17:22:07 -06:00 |
|
Justin Findlay
|
6d0d52fa86
|
modules.pkg int tests: skip refresh_db upon error (#34072)
|
2016-06-17 09:35:47 -06:00 |
|
Drew Adams
|
bcd6a1cd77
|
fix osfamily from Suse to SUSE
|
2016-05-26 22:08:40 -07:00 |
|
rallytime
|
fa5e17b342
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/modules/win_service.py
- salt/modules/zypper.py
- salt/states/pkgrepo.py
|
2016-03-30 15:33:13 -06:00 |
|
rallytime
|
d743f8cc4e
|
Merge branch '2015.5' into '2015.8'
Conflicts:
- salt/client/ssh/__init__.py
- salt/modules/aptpkg.py
- salt/modules/zypper.py
- salt/states/pkgrepo.py
|
2016-03-30 13:38:38 -06:00 |
|
Erik Johnson
|
5c1bdb812c
|
Fix pkgrepo integration test
Also re-enabled test on ubuntu 15.10.
|
2016-03-30 11:34:55 -05:00 |
|
rallytime
|
fe7ff0ebfa
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/cloud/__init__.py
- salt/returners/smtp_return.py
|
2016-03-10 13:13:35 -07:00 |
|
Ch3LL
|
910f0d9ffc
|
change pkg name to less for suse
|
2016-03-10 11:18:44 -07:00 |
|
rallytime
|
3b74d123af
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/modules/selinux.py
- salt/modules/zypper.py
- salt/pillar/__init__.py
- salt/states/dockerng.py
- tests/runtests.py
|
2016-02-25 12:36:22 -07:00 |
|
rallytime
|
9965fe188a
|
Added to pkg.info_installed test for RedHat and Suse systems
|
2016-02-24 09:50:52 -07:00 |
|
rallytime
|
1931c61563
|
Only run this pkg.info_installed test on distros that have that func
|
2016-02-23 15:22:14 -07:00 |
|
rallytime
|
0488668a00
|
Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name
Fixes #31370
|
2016-02-23 11:09:36 -07:00 |
|
Colton Myers
|
cb8bf91944
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/ref/configuration/master.rst
doc/topics/cloud/linode.rst
salt/cloud/clouds/linode.py
salt/modules/rh_ip.py
salt/renderers/pyobjects.py
salt/states/file.py
|
2016-01-21 17:42:50 -07:00 |
|
Justin Findlay
|
fb9972f590
|
modules.pkg: disable repo int test for ubuntu 15.10
|
2016-01-19 15:27:12 -07:00 |
|
Mike Place
|
83df4c4c75
|
Skip refresh db test if upstream repo does not repsond.
|
2015-12-16 10:23:10 -07:00 |
|
Justin Findlay
|
7a26c2b5b9
|
disable pkg.hold test for RHEL/CentOS 5
|
2015-06-17 16:36:36 -06:00 |
|
Justin Findlay
|
d88fb22fdc
|
fix pkg module integration tests on CentOS 5
|
2015-06-11 14:56:52 -06:00 |
|
Justin Findlay
|
fb91b40ba0
|
fix pkg module integration tests on ubuntu 12
|
2015-06-11 12:46:22 -06:00 |
|
Justin Findlay
|
c2db0b1758
|
fix pkg hold/unhold integration test
|
2015-06-02 11:56:18 -06:00 |
|
Justin Findlay
|
98944d8c7f
|
fix pkg test on ubuntu 12.04 for realz
|
2015-05-31 22:23:17 -06:00 |
|
Justin Findlay
|
9508924c02
|
fix pkg mod integration test on ubuntu 12.04
|
2015-05-29 15:52:57 -06:00 |
|
Justin Findlay
|
f1bd5ec404
|
adding pkg module integration tests
|
2015-05-23 19:34:37 -06:00 |
|