valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,284 Commits 24 Branches 182 Tags 341 MiB
852a6be3b6
Commit Graph

1030 Commits

Author SHA1 Message Date
Pedro Algarvio
5342305725
Allow NOT to install pip dependencies 2019-02-13 12:04:56 +00:00
twangboy
4177f64f28
Update url to libsodium for mac builds 2019-02-07 12:52:44 -07:00
Gareth J. Greenaway
05522c0867
Merge branch '2018.3.4' into add_py2_warning 2019-02-06 10:31:56 -07:00
twangboy
72fd1a2991
Roll back icon change 2019-01-31 17:56:16 -07:00
twangboy
7dd1704132
Add welcome_py2.rtf 2019-01-31 17:50:11 -07:00
twangboy
c93e9e39b9
Add Py2 Warning to installer package 2019-01-31 17:48:10 -07:00
twangboy
b658900c01
Add Py2 Warning for Py2 Installer 2019-01-31 15:53:31 -07:00
twangboy
e8b92338e9
Update requests on osx 2018-12-27 12:02:19 -07: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
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
b628ad729b
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-09-12 12:35:00 -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
rallytime
09247a33a2
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-10 12:53:13 -04:00
twangboy
6105ebbebb
Use setup.py clean --all 2018-09-07 17:29:33 -06:00
twangboy
fe02b2276f
Add 1.0.2p shasum file 2018-09-06 10:08:46 -06:00
twangboy
5f06dc2762
Fix issues with osx build scripts on 2018.3.3 
Upgrade openssl to 1.0.2p
 2018-09-06 10:05:58 -06:00
twangboy
750d3fa29e
Remove trusted host switches 2018-09-06 09:59:46 -06:00
twangboy
6b42e73ee9
Fix issues with build script on OSX 
Upgrade openSSL to 1.0.2p
Upgrade six to 1.11
 2018-09-06 09:37:24 -06:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
twangboy
fb97b00130
Fix broken path to libsodium tarball 2018-08-29 16:40:56 -06: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
twangboy
a112eaa597
Fix path to libsodium tarball 2018-08-23 10:15:28 -06: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 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
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
twangboy
e30d17099d
Use goto instead of if statement 2018-07-17 18:23:34 -06:00
twangboy
e1042fa084
Remove vcredist for Py3 2018-07-17 16:28:01 -06:00
rallytime
29b05ffdd1
Merge branch '2017.7' into '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/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
 2018-07-11 14:49:27 -04:00
twangboy
361b3cdc2f
Rollback python-certifi-win32 
It's causing issues with the test suite on Windows
 2018-07-11 10:33:39 -06:00
rallytime
68aabff0cf
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
  - salt/netapi/rest_tornado/saltnado.py
  - salt/utils/versions.py
  - tests/integration/states/test_file.py
 2018-07-09 10:27:58 -04:00
twangboy
b0087d425c
Add license info 2018-07-06 15:55:14 -06:00
twangboy
935f9b560c
Fix dependencies 
Adds back libnacl
Adds back libsodium.dll
Adds new python-certifi-win32
 2018-07-06 15:46:57 -06:00
Daniel Wallace
9f0bd90c5b
Merge pull request #48034 from vinian/restart-salt-syndic-when-salt-master-retart 
restart salt-syndic when salt-master restart
 2018-06-21 15:12:36 -05:00
twangboy
59ae2cc5fc
Use --disable-pip-version-check for build_env_#.ps1 2018-06-18 13:15:03 -06:00
twangboy
5c00fce6bf
Use the --disable-pip-version-check option 2018-06-18 19:06:10 +00:00
vinian
f7652d8c8b restart salt-syndic when salt-master restart 
Fixes: #48029
 2018-06-08 22:13:51 +08:00
Pablo Suárez Hernández
efe308013a
Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt 2018-05-31 11:02:18 +01:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
twangboy
66d8b0331a
Add sign.bat script for signing packages 2018-05-23 11:20:51 -06:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-08 14:36:53 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00