valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,384 Commits 24 Branches 182 Tags 341 MiB
5b5a930449
Commit Graph

45 Commits

Author SHA1 Message Date
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07: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
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
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
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
Niels Abspoel
7c817b4035 updated suse spec to 0.17.4 2013-12-25 08:42:09 +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
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
2efed79b21 Updated suse spec file to 0.16.3 
Updated suse spec file to 0.16.3 bugfix release.
removed creation of /var/cache/salt/minion/proc dir.
not needed anymore
 2013-08-09 20:21:49 +02:00
Niels Abspoel
6c1abf5ab6 updated suse packages to 0.16.2 2013-08-02 08:18:25 +02:00
Niels Abspoel
2c7b6f82e5 updated salt package to 0.16.1 2013-07-29 20:35:09 +02:00
Niels Abspoel
b4e1661c91 updated changes file to reflect 0.16.0 init fix 2013-07-18 07:37:00 +02:00
Niels Abspoel
209f85c2ac updated suse package for release 0.16.0 2013-07-02 22:36:13 +02:00
Niels Abspoel
f72aa06d54 updated salt.spec file for suse update 0.15.90 
Improved salt init files to match fedora package
These could be merged into one.
replaced service files for symlinks to match fedora package
added README.suse to reflect package names for addition python modules
 2013-06-22 08:03:28 +02:00
Niels Abspoel
2c1982aa17 updated suse salt.spec to 0.15.3 2013-06-02 00:14:33 +02:00
Niels Abspoel
f046e2e901 suse package updated to 0.15.2 
added salt user for salt-master daemon process
 2013-05-29 18:25:22 +02:00
Niels Abspoel
cc99c98343 updated suse spec file for inclusion in openSUSE:Factory. 
the package is now ready for opensuse release.
added logrotate and better systemd unit support.
removed some rpmlint bugs.
 2013-05-12 23:52:56 +02:00
Niels Abspoel
fdc6146faa updated salt.changes file 2013-05-08 23:50:06 +02:00
Niels Abspoel
48c1dfccec updated suse package for 0.15.1 release 2013-05-08 23:48:29 +02:00