 Pedro Algarvio
|
aaa399c7a7
Merge branch 'merge-forward/2018.3-to-2019.2' into merge-forward/2019.2-develop
|
5 lat temu |
|
Pedro Algarvio
|
054cf3dccf
Merge remote-tracking branch 'upstream/2018.3' into merge-forward/2018.3-to-2019.2
|
5 lat temu |
|
Pedro Algarvio
|
0cbed99dc1
Merge branch '2017.7' into 2018.3
|
5 lat temu |
|
Pedro Algarvio
|
cf86cbf6d0
Strings and integers are not comparable under Python 3
|
5 lat temu |
|
Daniel A. Wozniak
|
0de189d272
Handle pipenv like version restrictions
|
6 lat temu |
|
Ch3LL
|
82acce47cd
Handle encoding when opening file for both py2/py3
|
5 lat temu |
|
Ch3LL
|
138aca9551
Handle encoding when opening file for both py2/py3
|
5 lat temu |
|
Ch3LL
|
77101ed4fc
Handle encoding when opening file for both py2/py3
|
5 lat temu |
|
Wayne Werner
|
ee77f7cef9
Set encoding when reading the README.rst
|
5 lat temu |
|
Wayne Werner
|
b249180301
Set encoding when reading the README.rst
|
5 lat temu |
|
Gareth J. Greenaway
|
2ea7404d73
Merge branch '2018.3' into merge-fluorine
|
5 lat temu |
|
Wayne Werner
|
cd310c2501
Set long_description
|
5 lat temu |
|
Wayne Werner
|
e910bba80f
Set long_description
|
5 lat temu |
|
Gareth J. Greenaway
|
22eee4b534
Merge branch 'fluorine' into develop
|
6 lat temu |
|
Ch3LL
|
49368667e5
Merge branch 2018.3 into fluorine
|
6 lat temu |
|
Daniel A. Wozniak
|
9c6f65363e
Handle pipenv like version restrictions
|
6 lat temu |
|
Rares POP
|
74e41aba36
Merge branch 'develop' into dev/iepopr/add-saltapi-in-windows-installer
|
6 lat temu |
|
Nicole Thomas
|
5c2cc74390
Merge pull request #49936 from isbm/isbm-supportconfig-pkgfixes
|
6 lat temu |
|
Rares POP
|
f14d0542bf
Add salt-api in windows installer
|
6 lat temu |
|
rallytime
|
f434f31730
Remove support for RAET
|
6 lat temu |
|
Bo Maryniuk
|
32490c1b70
Add salt-support to the setup.py
|
6 lat temu |
|
markuskramerIgitt
|
5e3bcc2e3f
remove windows build cache
|
6 lat temu |
|
rallytime
|
6f6c99b4ce
Merge branch '2018.3' into 'develop'
|
6 lat temu |
|
rallytime
|
68aabff0cf
Merge branch '2017.7' into '2018.3'
|
6 lat temu |
|
Daniel Wallace
|
22cd4206c4
Merge pull request #48472 from gtmanfred/2017.7
|
6 lat temu |
|
twangboy
|
935f9b560c
Fix dependencies
|
6 lat temu |
|
Daniel Wallace
|
44aaac1d33
use tox to run pylint
|
6 lat temu |
|
Jorge Schrauwen
|
0d31b1388b
Fix dependancy for esky build on SmartOS
|
6 lat temu |
|
rallytime
|
d991430715
Merge branch '2018.3' into 'develop'
|
6 lat temu |
|
rallytime
|
a6533a9332
Merge branch '2017.7' into '2018.3'
|
6 lat temu |
