valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,620 Commits 24 Branches 182 Tags 341 MiB
3b6f39eb4e
Commit Graph

71 Commits

Author SHA1 Message Date
rallytime
9220ea0729 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
 2016-06-02 10:13:34 -04:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00
Bo Maryniuk
3b12f396b4 Prevent several minion processes on the same machine (#33464) 2016-05-24 07:37:03 -07:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
Justin Findlay
8de84b4251 update suse master service patch 
Fixes #780.
 2016-03-23 16:03:12 -06:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07: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
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -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
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
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Benjamin Drung
89dcb66310 Fix the wrong "allow to do" phrase 
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
 2015-11-04 12:15:41 +01:00
Zach Malone
318473d8fe Extra suse init script fix for $? after an echo 2015-10-23 09:58:34 -06:00
Zach Malone
d8767959d6 Removing $? after "echo" for other startup scripts 2015-10-23 09:57:53 -06:00
Niels Abspoel
8d796e6732 update suse spec file to 2015.8.1 2015-10-18 12:24:09 +02:00
Niels Abspoel
0ad617df21 Updated suse spec to 2015.5.1 2015-05-29 20:26:31 +02:00
Colton Myers
e52b5ab2e2 Remove stray >>>>> 2015-05-26 15:51:56 -06:00
Niels Abspoel
3f65631cb6 updated suse spec file to version 2015.5.0 2015-05-16 10:57:46 -06:00
Niels Abspoel
3d9fa5ce1c Updated suse spec file to salt 2014.7 2014-11-19 22:48:12 +01:00
Niels Abspoel
faaeb57759 Updated spec file to 2014.1.13 2014-10-27 22:47:30 +01:00
Erik Johnson
713f3ecc73 Spelling fixes 2014-10-11 20:13:45 -05:00
Niels Abspoel
5fd3ef480f updated salt.spec file for suse: 
this fixes #16560
 2014-10-11 20:29:52 +02:00
Chris Rebert
baa4f852df fix typo: Feauture => Feature 2014-08-11 11:00:23 -07:00
Niels Abspoel
d9bfda2dcd This fixes two issues #14337 and #13788 
use-forking-daemon.patch -> #14337
the other patchesr are for #13788

With thanks to Tim Serong who created the patches.
 2014-07-29 20:34:12 +02:00
Niels Abspoel
5b451d7e2d updated suse spec file for 2014.1.7 2014-07-11 19:50:06 +02:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Niels Abspoel
c950a14e64 updated suse spec file for 2014.1.5 2014-06-13 21:18:36 +02:00
Niels Abspoel
98d32aa37e updated suse spec file for 2014.1.4 2014-05-05 20:39:19 +02:00
Niels Abspoel
5cd37adb7d updated suse spec file to 2014.1.3 2014-04-18 20:35:33 +02:00
Niels Abspoel
2a39b57155 updated suse release to 2014.1.1 2014-03-25 21:08:36 +01:00
Niels Abspoel
f252aa2f29 Updated suse rpm specfiles for 2014-1 release 
removed symlinks to systemd service files now pypi tarball
includes pkg folder. Updated spec file to match these sources.
 2014-02-21 22:22:20 +01:00
Niels Abspoel
ba4d1d54b0 updated suse rpm to 0.17.5 2014-01-25 22:18:01 +01:00
Damian Myerscough
65cde36f94 Fix #9511 multiple PID's cause unary operator expected 2014-01-06 19:46:33 +01:00
Damian Myerscough
c6ed4980dc Fix #9511 multiple PID's cause unary operator expected 2014-01-06 19:41:34 +01:00
Niels Abspoel
7c817b4035 updated suse spec to 0.17.4 2013-12-25 08:42:09 +01:00
Seth House
4f00fa256b Fixed occurances of "Salt Stack" to SaltStack 2013-11-07 10:46:41 -07:00
Niels Abspoel
a4e2da99a8 updated suse spec file for salt-api 0.8.3 2013-11-04 23:00:20 +01:00
Niels Abspoel
47b6a803e2 updated salt spec file for 0.17.1 
disabled unit testing until next version broken with salt-testing 0.5.2
 2013-11-04 22:55:08 +01:00
Wari Wahab
d2094f8b60 Fixed all typos I can find 2013-10-25 16:26:57 +08:00
Niels Abspoel
c349f1cbb2 updated suse spec to salt 0.17.1 2013-10-23 07:50:21 +02:00
Niels Abspoel
5ae7fb1b53 updated suse pkg, inline with package guidelines 2013-09-28 23:16:06 +02:00
Niels Abspoel
4677b0a2c0 updated suse spec to salt 0.17.0 
created salt-ssh as a separate package
improved dependencies per package
salt-master depends pyzmq and recommends halite
salt-minion depends pyzmq
salt dependency pyzmq removed.
 2013-09-27 21:58:18 +02:00
Niels Abspoel
cc0fd3982a updated to 0.16.4 
The spec file is future ready for salt 0.17, this is commented
I have tested it on sles 11 sp3 and opensuse 12.3 vm.
 2013-09-08 00:59:34 +02:00
Niels Abspoel
1c9742d228 updated suse spec file 
Fixed non-executable-scripts warning from python checks
 2013-09-04 20:07:33 +02:00
Henrik Holmboe
0252dcd535 Configuration file for SuSEfirewall2 used in openSUSE 
This should probably be looked over by the Suse RPM package maintainer.
Untested on SLES.
 2013-09-04 14:34:48 +02:00