valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,853 Commits 24 Branches 182 Tags 341 MiB
4ebf7a3df4
Commit Graph

197 Commits

Author SHA1 Message Date
twangboy
214e1cc598 Fix 64bit detection, vcredist only on <= 2008 2017-01-24 11:56:11 -07:00
Mike Place
10a3d8b8dd Merge pull request #38726 from twangboy/vcredist 
Add VC Redist 2008 SP1 MFC to installer
 2017-01-19 12:13:41 -07:00
twangboy
f00a65355d change extensions .ext to .exe 2017-01-17 17:55:18 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
twangboy
98c40e278c Add VC Redist 2008 SP1 MFC to installer 2017-01-13 12:42:39 -07:00
twangboy
e0c7e5549b Update jinja2 to 2.9.4 2017-01-11 11:10:46 -07:00
twangboy
08200d2ee8 Update pyzmq to version 16.0.1 2016-11-14 17:12:59 -07:00
twangboy
cf55342150 Update pyzmq to version 15.3.0 2016-11-14 17:11:20 -07:00
twangboy
2de69f48f8 Detect VC for Python correctly on 32bit Windows 2016-11-03 18:23:19 +00:00
twangboy
2d697b30c6 Add lxml to deps for Windows (used by win_lgpo) 2016-10-03 17:35:11 -06:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon 2016-09-27 16:44:42 +09:00
twangboy
5fc63a1054 Add pyOpenSSL to req file for Windows 2016-09-26 17:35:28 -06:00
twangboy
3baeb2974d Add Estimated Size for Add/Remove Programs 2016-08-24 18:11:49 +00:00
twangboy
2ef1e00888 Add master build package build 2016-08-23 22:41:18 +00:00
twangboy
a3495d0852 Add minion only script 2016-08-23 22:37:17 +00:00
twangboy
3d6d473d48 Revert to vcredist 12 (2013) 2016-08-22 17:57:14 -06:00
twangboy
10af191a4d Revert to vcredist 12 (2013) 2016-08-22 17:38:50 -06:00
Mike Place
1fb2c03e88 Merge pull request #35474 from twangboy/fix_windows_installer 
Hide minion config page, add master config file
 2016-08-20 12:11:37 +09:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop' 
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
 2016-08-17 12:13:26 -06:00
Nicole Thomas
e86a39a115 Merge pull request #35516 from rallytime/bp-34441 
Back-port #34441 to 2016.3
 2016-08-17 09:47:23 -06:00
markuskramerIgitt
32da48df08 setup.py will not print each individual file 2016-08-17 08:35:44 -06:00
markuskramerIgitt
698a076a39 Completely remove Python and verify 2016-08-17 08:35:44 -06:00
markuskramerIgitt
7406bd22a6 Errors will stop the scripts 2016-08-17 08:35:44 -06:00
markuskramerIgitt
e47c661cb0 Copy and delete silently, do not list each file 2016-08-17 08:34:06 -06:00
twangboy
c20803de07 Hide minion config page, add master config file 2016-08-15 22:53:27 +00:00
twangboy
d120a8906f Add vcredist 14 dlls 2016-08-10 18:56:08 +00:00
twangboy
00eff0a1a8 Fix architecture detection 2016-08-09 21:26:57 +00:00
twangboy
153b674fc5 Detect 32/64 bit installation 2016-08-09 21:09:36 +00:00
twangboy
23fbc7890c Fix previous version detection 2016-08-09 20:57:33 +00:00
twangboy
e661540526 Fix VC Compiler detection for 32bit Windows 2016-08-09 20:44:47 +00:00
twangboy
978775714b More standardization 2016-08-09 20:11:45 +00:00
twangboy
5787e27af1 Standardize build scripts 2016-08-09 19:53:55 +00:00
twangboy
99ac8acce6 Add path to Python Scripts to build.bat 2016-08-09 19:27:28 +00:00
twangboy
4f78bb0f34 Add path, fix uninstaller 2016-08-09 18:58:58 +00:00
twangboy
8e056168a4 Add function for adding to the path 2016-08-09 17:23:49 +00:00
twangboy
418e649be7 Fix App Paths entries 2016-08-09 17:23:49 +00:00
twangboy
d453199b56 Fix services not starting correctly, use nsExec 2016-08-09 17:23:48 +00:00
twangboy
cc88e50a42 Add Salt-Master to installer 2016-08-09 17:23:47 +00:00
twangboy
9218278873 Fix Title/Subtitle on Minion Config page 2016-08-09 17:23:47 +00:00
twangboy
a860580c79 Change GUID for python 2.7.12 2016-08-09 17:23:47 +00:00
twangboy
31ffb8f6e5 Add dependency dlls to script 2016-08-09 17:23:46 +00:00
twangboy
4149f0c237 Update pip requirements 2016-08-09 17:23:46 +00:00
Mike Place
bb0c7118ba Merge pull request #34502 from markuskramerIgitt/develop 
Windows installer build scripts will exit on error
 2016-07-07 16:05:31 -06:00
markuskramerIgitt
d87277ef89 setup.py will not print each individual file 2016-07-07 23:57:28 +02:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
markuskramerIgitt
44025e123e Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2016-07-07 01:29:54 +02:00
markuskramerIgitt
eed5b61dad Completely remove Python and verify 2016-07-07 01:17:16 +02:00
markuskramerIgitt
d464447b86 Errors will stop the scripts 2016-07-07 00:18:01 +02:00
Shane Lee
17a3b23ff8 Use Python 2.7.12 for Windows Build (#34468) 2016-07-06 17:29:50 -04:00
Mike Place
516f494565 Merge pull request #34441 from markuskramerIgitt/develop 
Copy and delete silently, do not list each file
 2016-07-05 22:02:51 -06:00