valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,671 Commits 24 Branches 182 Tags 341 MiB
00794a208c
Commit Graph

1078 Commits

Author SHA1 Message Date
Salt Admin
00794a208c Add new logo, add welcome_py.rtf 2019-01-31 17:09:47 -07:00
twangboy
ea03c1e7ac
Remove alpha layer 2019-01-31 16:38:51 -07:00
twangboy
792ba1830a
Update installer graphic 2019-01-31 16:34:54 -07:00
Pedro Algarvio
d4d401b5d9
Merge branch '2019.2.0.rc1' into update_req_osx 2019-01-23 07:28:41 +00:00
twangboy
1d00b0543d
Rollback zeromq to 4.1.6 2019-01-16 14:22:22 -07:00
twangboy
c64698968d
Backport pyobjc 2019-01-15 16:39:49 -07:00
twangboy
dcc74f2692
Rollback two dependencies 
GitPython==2.1.10
CherryPy==17.4.1
 2019-01-15 11:38:58 -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
ea0acbabf6
Update dependencies in req.txt for OSX 2019-01-14 17:39:29 -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
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
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
Eric Cook
10eb4fb343
zsh-completion: strip out u'' unicode __repr__ of function names 
The elements in the array returned by sys.list_{,runners_}functions
recently started to be enclosed by u'' so when the completer parses
salt-call --local --out txt sys.$func, the incorrect module is
presented.
 2018-09-25 12:27:47 -04:00
rallytime
ca80ccec6b
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/states/test_pip_state.py
 2018-09-13 17:14:09 -04: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
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
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
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 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
Nicole Thomas
fb5d63da16
Merge pull request #48761 from isbm/isbm-add-saltapi-logrotate 
Add API log rotation on SUSE package
 2018-07-25 11:42:45 -04:00
Bo Maryniuk
3a149b0009 Add API log rotation on SUSE package 2018-07-25 11:19:53 +02: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