saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
101183 commits 34 branches 292 tags 802 MiB
Commit graph

122 commits

Author SHA1 Message Date
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/states/linux_acl.py
  - salt/transport/ipc.py
 2019-03-28 11:10:45 -04:00
Gareth J. Greenaway
11cd485a8b
Merge branch '2018.3' into merge-2019.2 
Conflicts:
   - doc/topics/installation/freebsd.rst
 2019-03-25 13:42:28 -07:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3 2019-03-25 13:28:15 -07:00
Pedro Algarvio
1f99e28550
Let's not include raet by default 2019-03-21 19:26:48 +00:00
Pedro Algarvio
57348cad9d
Add static requirements for Arch linux 2019-03-21 11:42:49 +00:00
Gareth J. Greenaway
1aa1bd8edc
Merge branch '2017.7' into merge-2018.3 
Conflicts:
  - tests/integration/modules/test_shadow.py
 2019-03-20 14:28:14 -07:00
Pedro Algarvio
b039cec21a
Windows now has a static requirements file and no longer needs hacks 2019-03-20 14:02:51 +00:00
Pedro Algarvio
6a789a1a89
Update static requirements 2019-03-15 16:52:27 +00:00
Pedro Algarvio
cee9480ee3
Lock PyYAML to < 5.1 
The reason being that at least one unit test case will leak memory until
exhaustion.
 2019-03-15 16:45:54 +00:00
Pedro Algarvio
45a3e4a0ca
distro reports Opensuse 15 as Opensuse Leap 15 2019-03-15 11:32:51 +00:00
Pedro Algarvio
de7bb24d44
Ubuntu 18.04 locked requirements files 2019-03-15 11:18:05 +00:00
Pedro Algarvio
bc08e3c823
Ubuntu 16.04 locked requirements files 2019-03-15 11:17:58 +00:00
Pedro Algarvio
0d353d2ff3
Ubuntu 14.04 locked requirements files 2019-03-15 11:17:52 +00:00
Pedro Algarvio
1186122223
Opensuse 42 locked requirements files 2019-03-15 11:17:43 +00:00
Pedro Algarvio
fa6888bb88
Opensuse 15 locked requirements files 2019-03-15 11:17:33 +00:00
Pedro Algarvio
b6578b8d82
Fedora 29 locked requirements files 2019-03-15 11:17:22 +00:00
Pedro Algarvio
777dbb090f
Fedora 28 locked requirements files 2019-03-15 11:17:15 +00:00
Pedro Algarvio
4388fa9644
Debian 9 locked requirements files 2019-03-15 11:17:05 +00:00
Pedro Algarvio
2f9030fcbb
Debian 8 locked requirements files 2019-03-15 11:16:57 +00:00
Pedro Algarvio
1b18ec597f
CentOS 7 locked requirements files 2019-03-15 11:16:50 +00:00
Pedro Algarvio
6e9f0c06af
CentOS 6 locked requirements 2019-03-15 11:16:43 +00:00
Pedro Algarvio
741584669c
Start handling static(and platform specific) requirements files 2019-03-15 11:16:35 +00:00
Pedro Algarvio
6f0d4076e1
Actually, remove python-ldap. It needs system deps. Have salt-jenkins do it. 2019-02-01 16:37:14 +00:00
Pedro Algarvio
3f177766d8
Actually, remove python-ldap. It needs system deps. Have salt-jenkins do it. 2019-02-01 16:36:25 +00:00
Pedro Algarvio
cc94dab469
Fix the ldap pacakge name in requirements/tests.txt 2019-02-01 16:23:48 +00:00
Pedro Algarvio
afcb6bdc84
Fix the ldap pacakge name in requirements/tests.txt 2019-02-01 16:22:43 +00:00
Pedro Algarvio
55878672ea
Switch required PyTest dependency 2019-01-30 11:49:17 +00:00
Pedro Algarvio
4994c388de
Switch required PyTest dependency 2019-01-30 11:48:30 +00:00
Pedro Algarvio
1c62e2750e
Switch required PyTest dependency 2019-01-30 11:46:50 +00:00
Pedro Algarvio
ee2f10a23b
Add pytest-salt-from-filenames to pytest requirements 2019-01-25 13:00:03 +00:00
Pedro Algarvio
4f4d019ef8
Remove duplicate dependency 2019-01-25 13:00:03 +00:00
Pedro Algarvio
840b3d2103
Add pytest-salt-from-filenames to pytest requirements 2019-01-24 17:02:13 +00:00
Pedro Algarvio
716bda4414
Remove duplicate dependency 2019-01-24 17:02:13 +00:00
Pedro Algarvio
97ced3a5ba
Add pytest-salt-from-filenames to pytest requirements 2019-01-24 16:58:41 +00:00
Pedro Algarvio
8d2c4d25df
Remove duplicate dependency 2019-01-24 16:58:41 +00:00
Pedro Algarvio
6dd8e40266 Update pytest requirements 2019-01-19 18:38:44 +00:00
Pedro Algarvio
00a7ba0696 Move all of PyTest requirements to its own requiremnts file 2019-01-19 18:38:44 +00:00
Pedro Algarvio
5543a53215 Update pytest requirements 2019-01-19 18:37:52 +00:00
Pedro Algarvio
f958df5c2e Move all of PyTest requirements to its own requiremnts file 2019-01-19 18:37:52 +00:00
Pedro Algarvio
acfb7d89b4 Update pytest requirements 2019-01-19 18:37:41 +00:00
Pedro Algarvio
c19479bf4e Move all of PyTest requirements to its own requiremnts file 2019-01-19 18:37:41 +00:00
rallytime
8fed338708
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/spm/pkgfiles/local.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-10-25 10:31:06 -04:00
C. R. Oldham
f3e5399cc4
Ignore testinfra 1.17.0 2018-10-24 11:38:24 -04:00
rallytime
0412c5654e
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-06 12:20:52 -04:00
rallytime
9e274335a3
Pin CherryPy version to < 18.0.0 in requirements files for PY2 
Version 18.0 now requires Python 3.5, so we need to pin this for Py2.
 2018-09-04 10:51:12 -04:00
rallytime
81a6155b6b
Pin CherryPy version to < 18.0.0 in requirements files for PY2 
Version 18.0 now requires Python 3.5, so we need to pin this for Py2.
 2018-09-04 10:47:41 -04:00
Daniel Wallace
0abd02a6f6
add lxd tests 2018-08-09 10:33:06 -05:00
Daniel Wallace
f99283751f
handle pyzmq for python3.4 2018-07-18 12:16:05 -05:00
Daniel Wallace
3c1882077e
handle pyzmq for python3.4 2018-07-18 12:15:55 -05:00
Daniel Wallace
b6ee52f859
handle pyzmq for python3.4 2018-07-18 12:15:23 -05:00