valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,947 Commits 24 Branches 182 Tags 341 MiB
9ee623b15d
Commit Graph

148 Commits

Author SHA1 Message Date
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
markuskramerIgitt
7257b8d832 Copy and delete silently, do not list each file 2016-07-02 22:36:49 +02:00
markuskramerIgitt
994d1a3e6a Added description to nsi salt-minion service. 2016-06-22 16:37:55 +02:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Shane Lee
e4a7190a1d Always make chanes to minion config if set (#34021) 2016-06-15 12:53:42 -04:00
Shane Lee
38e82fb89e Always make changes to minion config if set (#34022) 2016-06-15 12:53:19 -04:00
twangboy
dd7d55afb9 Use full path to python.exe 2016-06-13 12:01:15 -06:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 14:12:48 -04:00
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
twangboy
7d78e5d612 Fix build script where pip wouldn't work 2016-05-25 17:38:39 +00:00
Shane Lee
ca6e929ded Fix libsodium for 32bit windows (#33455) 
* Add platform specific libsodium dlls

* Update libnacl to 1.4.5
 2016-05-24 08:11:44 -07:00
Shane Lee
f61cf6929a Add PyYAML with CLoader (#33079) 
- Check for python before installing
- Update other dependencies to the latest
 2016-05-06 08:28:03 -07:00
Shane Lee
7da7b2329d Remove _get_date_time_format function (#32903) 
* Remove _get_date_time_format function

* Fix incorrect timelib version
 2016-04-28 10:06:44 -06:00
Shane Lee
25df973d4c Added pycurl to windows dependencies (#32731) 2016-04-25 11:13:10 -06:00
Shane Lee
13f18beefc Add license information for pip modules (#32738) 
* Adds readme file for license information

* Add special requirements modules
 2016-04-21 08:12:04 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/states/user.py
 2016-04-15 13:58:50 -06:00
Shane Lee
d12a1c2b8d Fix binary search and replace (#32542) 2016-04-13 10:15:02 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 13:38:38 -06:00
twangboy
b7fcae97ce Create minion.d directory, fixes #31976 2016-03-29 14:17:24 -06:00
twangboy
6984d5a075 Update pip and setuptools using req-pip.txt 2016-03-28 18:39:24 -06:00
twangboy
94354c45de Fix upgrade pip 2016-03-28 18:27:36 -06:00
twangboy
733ef7c3e0 Make VC Compiler for Python install silently 2016-03-28 18:23:26 -06:00
twangboy
33735ada22 Fix VC for Python install 2016-03-28 18:21:58 -06:00
twangboy
2f957409ad Add timelib and prereqs for compiling 
Add timelib==0.2.4 to req.txt
Add check for VC Compiler for python
Add installer for VC Compiler
 2016-03-28 18:15:00 -06:00
twangboy
4af8c9dbfc Back port nullsoft build script from 2015.8 2016-03-16 17:57:04 -06:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
twangboy
1f6a95694d Grant permissions using SID instead of name 2016-02-29 18:09:31 -07:00
twangboy
f7a9b09fb6 Move build files to salt/pkg/windows 2016-02-12 21:00:30 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Mike Place
87f2816ef5 Merge pull request #31029 from twangboy/win_defaults 
Windows defaults to multiprocessing true
 2016-02-09 11:20:36 -07:00
twangboy
baffbbdb74 Comment multiprocessing line in minion config 2016-02-08 18:14:17 -07:00
twangboy
8876893b5c Fix remove placeholder files 2016-02-08 17:51:36 -07:00
twangboy
788855cc94 Remove placeholder files 2016-02-08 17:42:07 -07:00
twangboy
c834a9d5e5 Set overwrite to off 
Remove place holder files (empty)
 2016-02-08 17:29:39 -07:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Craig Rodrigues
381e8cc144 Use print as a function [PEP 3105]. 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
 2015-12-04 16:17:35 -08:00
twangboy
90b19a3279 Fixed the script... something got broke... 2015-11-04 10:53:10 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
twangboy
a0c5223554 Fixes #27923 and #28000 
Fixed a bug where the installer wouldn't grab current config if the salt
service was stopped
Added a switch to start the salt service at the end
Switch works with both silent and GUI installs
/start-service=1 will start the service
/start-service=0 will not start the service
Default is to start the service
 2015-10-27 15:43:22 -06:00
twangboy
63a7305ae9 Uninstaller only removes specific files and dirs 
Fixes: #27032

Uninstaller only removes the following:
- ./bin
- salt*
- nssm.exe
- uninst.exe

All other files will remain untouched
 2015-09-24 14:59:32 -06:00
twangboy
7e35b13022 Turned multiprocessing on 2015-09-11 08:10:52 -06:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
twangboy
e61eeba48b Fixed problem with service not starting 2015-07-08 22:23:45 +00:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Colton Myers
e1d45ccf3b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-10 12:02:42 -06:00
twangboy
673e1d809e Added missing panel.bmp for installer 2015-06-09 10:28:09 -06:00
twangboy
cc50218b01 Start Minion Service on Silent Install 2015-06-09 09:34:41 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00