valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,697 Commits 24 Branches 182 Tags 341 MiB
5a57f2e1c6
Commit Graph

567 Commits

Author SHA1 Message Date
Jorge Schrauwen
8077fe3e19 drop M2Crypto from the SmartOS esky builds 2016-03-05 23:43:18 +00: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
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02: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
Bo Maryniuk
f73f70375c Force-kill websocket's child processes faster than default two minutes. 2016-02-11 15:16:43 +01: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
Jorge Schrauwen
4b9d052eb5 fix build on smartos #30968 2016-02-07 21:41:43 -07:00
twangboy
3654a0e0c2 Change 2015 to 2016 in license file 2016-02-05 09:37:46 -07:00
twangboy
aa7d0602a8 Update instructions in readme.md for shasum 2016-02-05 09:36:23 -07:00
twangboy
6f1a8f4146 Added code to add /opt/salt/bin to the path 
remmed out
 2016-02-05 09:36:02 -07:00
twangboy
1e7468a08c Disable master, syndic, and api in postinstall 
I tried doing this through the plist files but no matter
what I did they would still start
 2016-02-05 09:35:43 -07:00
twangboy
d49b3dcf1b Re-added start on load and keep alive 2016-02-05 09:35:15 -07:00
twangboy
3ff50a2254 Removed keepalive option 2016-02-05 09:35:01 -07:00
twangboy
eb5d04bdf1 Remove autostart for api, master, and syndic 2016-02-05 09:34:39 -07:00
twangboy
3c0cce34c9 Added minimum requirements for installation 
64bit El Capitan
 2016-02-05 09:34:15 -07:00
twangboy
1dcc23c85b Fix error on kickstart command 2016-02-05 09:34:02 -07:00
twangboy
7a163c46d8 Change to new way of starting and stopping services 2016-02-05 09:33:44 -07:00
twangboy
23d47722b7 Fix preinstall and postinstall scripts 
stops the service if running
starts the service after install
service names follow apple naming convention (com.saltstack.salt...)
 2016-02-05 09:33:30 -07:00
twangboy
7ef723d815 Upgrade to latest pip 2016-02-05 09:33:16 -07:00
twangboy
0f09ad517f Updated pip dependencies 2016-02-05 09:32:59 -07:00
twangboy
d3d4c1d13f Removed GPL Licensed software from build 
Removed:
- gdbm
- gnu-readline
- libgit2
- pygit2
- cmake (used to compile libgit2)

Removed traces of pkg-congig after build

Updated license to say it was built using pkg-config

Updated openssl to 1.0.2f
 2016-02-05 09:32:42 -07:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Colton Myers
80d0e428aa Merge pull request #30624 from cro/remove_bad_symlinks 
Remove bad symlinks from osx pkg dir
 2016-01-25 17:02:25 -07:00
C. R. Oldham
f5fd38624e Remove bad symlinks in osx pkg dirs 2016-01-25 14:29:51 -07:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Jorge Schrauwen
8417f8da08 drop augeas as libaugeas is a pain to patch 2016-01-23 14:02:59 +00:00
Jorge Schrauwen
a48c7b6b2b smartos packages are frozen so adding modules via pip does not work, include a few more by default 2016-01-23 13:10:05 +00:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10 
Changed old doc links from docs.saltstack.org to docs.saltstack.com
 2016-01-22 10:48:08 -07:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
David Cournapeau
3c27ab5310 BUG: fix osx .pkg script locations to match the .plist files. 2016-01-19 09:37:20 -08:00
David Cournapeau
ed9ab68d3b BUG: fix missing sudo when linking certify cert. 2016-01-19 07:58:11 -08:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
twangboy
0be53953af Added function to download and check hashes, added hash files 2015-12-22 13:08:23 -07:00
twangboy
7f0b87bfb3 Added pre/post flight scripts (not running) 2015-12-22 09:28:47 -07:00
twangboy
9eeb6da7bd Improvements to osx packaging scripts 2015-12-21 13:07:53 -07:00
Mike Place
14a19f9313 Merge pull request #29634 from cachedout/lint_29459 
Lint 29459
 2015-12-11 12:53:07 -07:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Benjamin Drung
b1a4ade618 Drop obsolete syslog.target from systemd services 
Declaring After=syslog.target is unnecessary by now because syslog is
socket-activated and will therefore be started when needed. Thus remove
the obsolete syslog.target from the systemd service files.
 2015-12-08 13:48:34 +01:00
Damian Myerscough
85a8a3b033 Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys 2015-12-05 00:21:57 -08:00