valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
102,219 Commits 24 Branches 182 Tags 341 MiB
f5492bd7f0
Commit Graph

388 Commits

Author SHA1 Message Date
twangboy
9544624764
Add watchdog as a bundled dependency on Windows 2019-08-07 09:58:38 -06:00
Shane Lee
748bf1cb71
Merge branch '2019.2.1' into fix_pywin32_2019.2.1 2019-07-02 16:43:25 -06:00
Pedro Algarvio
b9618f6fa6
Take into account the packaging requirements for windows 2019-06-11 14:30:12 +01:00
twangboy
fb4090d175
update py3 script 2019-05-23 12:25:37 -06:00
twangboy
0ea70ba0c8
Don't remove pythonwin directory 2019-05-23 12:24:45 -06:00
twangboy
6f0b8e25ae
Add pymssql dependency for Windows builds 2019-05-02 16:59:27 -06:00
twangboy
9ec54c47c7
Add TLS support up to TLS 1.2 2019-04-12 13:44:49 -06:00
Ch3LL
a16891347c
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - doc/conf.py
  - salt/modules/win_system.py
  - salt/states/boto3_route53.py
 2019-03-05 16:00:05 -05:00
twangboy
e2d496cf94
Add zabbix to the Windows builds 2019-02-28 16:34:17 -07:00
Gareth J. Greenaway
09fb3e7fc5
Merge branch '2019.2' into merge-2018.3 2019-02-13 10:32:21 -08:00
Pedro Algarvio
d2125aa38b
Allow NOT to install pip dependencies 2019-02-13 12:09:14 +00:00
Pedro Algarvio
5342305725
Allow NOT to install pip dependencies 2019-02-13 12:04:56 +00:00
Daniel Wozniak
4abd9d0462
Merge branch '2019.2' into merge-2018.3 2019-02-13 01:12:52 -07: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
twangboy
081fb40bd4
Remove unecessary !define for Py3, use default message 2019-01-31 16:01:03 -07:00
twangboy
b658900c01
Add Py2 Warning for Py2 Installer 2019-01-31 15:53:31 -07:00
twangboy
92e4f4e63a
Add Py2 warning, Update Icon and Graphic 2019-01-31 15:19:08 -07:00
twangboy
8d8a15c7ee
Rollback GitPython to 2.1.10 2019-01-15 11:36:40 -07:00
twangboy
ab38f89c1a
Downgrade CherryPy to 17.4.1 2019-01-14 20:46:58 -07:00
twangboy
3edfef31c1
Update dependencies in req.txt for Windows 2019-01-14 17:30:24 -07:00
twangboy
9992eb40c1
Update python to 2.7.15 and 3.5.4 for Windows installers 2019-01-09 16:08:57 -07:00
Gareth J. Greenaway
09815e7f77
Merge branch '2018.3' into merge-fluorine 
Conflicts:
   - salt/states/win_lgpo.py
   - salt/utils/minions.py
 2019-01-01 13:50:01 -08:00
twangboy
b22856f8ed
Update requests to 2.21.0 2018-12-27 12:01:15 -07:00
twangboy
0d4b799969
Upgrade requests to 2.20.1 2018-11-08 11:10:08 -07:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
rallytime
91534ee04a
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-08 16:16:45 -04:00
twangboy
a66765fc4c
Remove arrInstalled artifact 2018-10-04 09:49:12 -06:00
rallytime
bd5ec82921
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/runners/nacl.py
  - salt/tops/varstack_top.py
  - tests/unit/states/test_linux_acl.py
 2018-09-12 12:47:09 -04:00
rallytime
19598d8802
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/cloud/clouds/proxmox.py
  - salt/minion.py
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/returners/local_cache.py
  - salt/returners/rawfile_json.py
  - salt/utils/minions.py
 2018-09-11 12:51:52 -04:00
twangboy
6105ebbebb
Use setup.py clean --all 2018-09-07 17:29:33 -06:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
rallytime
da3a29c680
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-08-28 12:06:32 -04:00
twangboy
68fd37575e
Fix erroneous NSSM reference 2018-08-23 17:28:56 -06:00
twangboy
103f2c289e
Remove delete vcredist line 2018-08-23 17:24:38 -06:00
twangboy
007a16638e
Bring installer updates from 2017.7.8 to 2018.3.3 2018-08-23 17:13:53 -06:00
rallytime
937897b14c
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/states/file.py
  - salt/utils/vault.py
 2018-08-23 12:50:08 -04:00
twangboy
a8f054b2d2
Add 64bit binaries for KB2999226 to the x86 installer 
Fix logic where it detects the Architecture of the system running the
installer instead of the one building the installer
Add a 3 seconds pause to actually see the error code if it throws one
 2018-08-22 22:34:50 -06:00
twangboy
e8a1d2f772
Add more descriptive error when KB not found 2018-08-20 17:04:10 -06:00
twangboy
71737ea687
Suppress all ui on vcredist installation 2018-08-20 16:48:39 -06:00
twangboy
7dae9bb2a1
Fix Windows and OSX installers 
Adds support to Universal Runtime Libraries (UCRT) for Windows
Adds futures to the req.txt for OSX
 2018-08-20 16:11:34 -06:00
Daniel Wozniak
8fd0c38f49
Merge pull request #49171 from Ch3LL/bp-49103 
[2018.3.3] cherry pick #49103
 2018-08-18 10:56:54 -07:00
Daniel A Wozniak
05a2b91fb2
Install the launcher so we can execute py files 2018-08-17 11:25:32 -04:00
twangboy
1227095c5d
Add nonfatal switch to VCRedist 2018-08-14 10:21:18 -06:00
Daniel A Wozniak
566a4ea66a
Install the launcher so we can execute py files 2018-08-13 16:21:59 -07:00
rallytime
12fee6d1b9
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/acme.py
  - salt/modules/npm.py
  - salt/states/acme.py
 2018-07-24 14:19:22 -04:00
rallytime
e740d3b208
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/client/ssh/wrapper/state.py
  - salt/modules/dockermod.py
  - salt/modules/npm.py
  - salt/modules/testinframod.py
  - tests/integration/modules/test_mac_system.py
  - tests/integration/modules/test_mac_timezone.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_npm.py
  - tests/unit/states/test_file.py
 2018-07-23 11:15:43 -04:00
markuskramerIgitt
1cb0b5c6a7 Lesser logging 2018-07-19 20:04:06 +02:00
markuskramerIgitt
2a88ebb102 DarkGreen Foreground 2018-07-19 19:35:12 +02:00
markuskramerIgitt
5e3bcc2e3f remove windows build cache 2018-07-19 18:25:21 +02:00
twangboy
e30d17099d
Use goto instead of if statement 2018-07-17 18:23:34 -06:00