valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,007 Commits 24 Branches 182 Tags 341 MiB
bbd159f8a0
Commit Graph

19007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
73d1b6add8 Fix #7526 
This should prevent already loaded mods from being reloaded from the
top level of the matches
 2013-10-15 11:55:16 -06:00
Thomas S Hatch
f4c69dca97 clear out unused masterstate function 2013-10-15 11:53:56 -06:00
C. R. Oldham
7e983e9c36 Remove original return call 2013-10-15 11:53:37 -06:00
C. R. Oldham
8793429f72 Make sure that ssh keys don't get added with incorrect encoding types. 2013-10-15 11:48:28 -06:00
Thomas S Hatch
2790f5c555 Merge pull request #7849 from cachedout/develop 
Catch a condition where salt-run might fail with a KeyError on master_uri. ...
 2013-10-15 10:29:38 -07:00
Mike Place
bf92ef7271 Catch an error where salt-run might fail with a KeyError on master_uri. Thanks, Tom! 2013-10-15 11:25:28 -06:00
Thomas S Hatch
387f097959 Merge pull request #7807 from scottp-dpaw/develop 
Bootstrapping for Windows minions
 2013-10-15 09:49:08 -07:00
Thomas S Hatch
08c2f23e33 Merge pull request #7675 from Caustic/overstate-patch 
overstate: Patching to fail on requisite failures.
 2013-10-15 09:47:54 -07:00
Thomas S Hatch
0e8ded0b19 Merge pull request #7848 from loz-hurst/develop 
Updated salt.states.alternatives to fix incorrect docstring.
 2013-10-15 09:36:39 -07:00
Thomas S Hatch
d687bf7895 Merge pull request #7847 from cachedout/develop 
Catch AttributeErrors and fall back to default outputter. Refs #7845.
 2013-10-15 09:13:43 -07:00
Thomas S Hatch
6d8e27efc6 Give them both! This should make some cleaner middle ground here 2013-10-15 10:03:32 -06:00
loz-hurst
c9baedb4b9 Updated salt.states.alternatives to fix incorrect docstring. 
Doc string for salt.states.alternatives.set_ appears to be compied and pasted from salt.states.alternatives.remove and does not correspond to what the set_ actually method does.  Fixed this.
 2013-10-15 16:52:38 +01:00
Mike Place
eb8200fcbd Catch AttributeErrors and fall back to default outputter. Refs #7845. 2013-10-15 09:51:15 -06:00
Thomas S Hatch
2738072c40 Merge pull request #7840 from scottp-dpaw/patch-1 
Refreshed build instructions for Windows
 2013-10-15 08:25:32 -07:00
Thomas S Hatch
7a89a79379 Merge pull request #7799 from eliasp/auth-ldap 
External auth LDAP improvements
 2013-10-15 08:22:49 -07:00
Pedro Algarvio
6959016b99 Merge pull request #7838 from ekatsah/fix-trail-slash 
Fix remove possible trailing slash in name of mounted state
 2013-10-15 05:19:35 -07:00
Joseph Hall
95911ccf8d Merge pull request #7843 from valentinbud/develop 
Added salt.utils.validate to setup.py.
 2013-10-15 04:37:04 -07:00
Valentin Bud
5ae5b70794 Added salt.utils.validate to setup.py. 2013-10-15 14:28:58 +03:00
scottp-dpaw
89dfebf80f Refreshed build instructions for Windows 2013-10-15 16:47:37 +08:00
steak
72723c0548 Fix remove possible trailing slash in name of mounted state 2013-10-15 07:47:27 +02:00
Thomas S Hatch
bb913dad72 Merge pull request #7837 from terminalmage/quickfix 
Fix incorrect versionadded directives
 2013-10-14 22:21:44 -07:00
Thomas S Hatch
75c904473b Merge pull request #7836 from terminalmage/freebsdports 
Initial commit of freebsdports module
 2013-10-14 22:21:16 -07:00
Thomas S Hatch
da7f114947 Merge pull request #7834 from cachedout/develop 
Fix #7695 and add self to AUTHORS
 2013-10-14 22:20:26 -07:00
Thomas S Hatch
b550323490 Merge pull request #7831 from jesusaurus/rabbitmq 
Setting owner permissions fails if the vhost was not added
 2013-10-14 22:19:11 -07:00
Thomas S Hatch
0fbed93141 Merge pull request #7828 from corywright/fix_mysql_grant_absent_strings 
fixes #7827 - String formatting is broken for mysql_grants.absent
 2013-10-14 22:18:37 -07:00
Thomas S Hatch
9d5dd30f89 Merge pull request #7820 from cvrebert/patch-4 
utils/validate/net.py: simplify mac()
 2013-10-14 22:18:17 -07:00
Thomas S Hatch
5f25f0e6f0 Merge pull request #7810 from moniker-dns/rabbitmq-fixes 
Correct RabbitMQ plugin management command name
 2013-10-14 22:17:39 -07:00
Erik Johnson
da8f334543 Merge pull request #7818 from cvrebert/patch-2 
modules/qemu_nbd.py: rm unused import of yaml
 2013-10-14 21:27:23 -07:00
Erik Johnson
44ffa99681 Merge pull request #7819 from cvrebert/patch-3 
salt/utils/verify.py: rm trailing whitespace
 2013-10-14 21:26:39 -07:00
Erik Johnson
4f5b0ffabe Fix incorrect versionadded directives 
There is no release 0.17, the correct release number is 0.17.0.
 2013-10-14 23:25:49 -05:00
Erik Johnson
09330d9cdd Initial commit of freebsdports module 
It doesn't support actually building a port yet, but this initial commit
supports modifying the existing config options, running "make rmconfig",
and also "make showconfig".
 2013-10-14 23:19:45 -05:00
Mike Place
c347aa661f Return None for the version and log a warning if the Postgres server cannot be reached. Refs #7695. 2013-10-14 20:17:54 -06:00
Joseph Hall
85c81c2032 Merge pull request #7832 from s0undt3ch/develop 
Update the translations doc to include the client setup.
 2013-10-14 18:22:42 -07:00
Pedro Algarvio
45bd454c86 Update the translations doc to include the client setup. 2013-10-15 01:28:08 +01:00
Mike Place
141a52ac6c Added self to AUTHORS. 2013-10-14 17:10:20 -06:00
K Jonathan Harker
c38274218d Don't try to set the rabbitmq_vhost permissions when adding the vhost fails 2013-10-14 22:58:44 +00:00
David Boucha
7c97445ee6 Merge pull request #7830 from cachedout/develop 
Add markupsafe to requirements file because it is required for salt-ssh.
 2013-10-14 15:37:08 -07:00
Mike Place
61398a7246 Add markupsafe to requirements file because it is required for salt-ssh. 2013-10-14 16:22:17 -06:00
David Boucha
e4c85c61be Merge pull request #7825 from s0undt3ch/features/i18n-documentation 
i18n documentation updates
 2013-10-14 14:49:28 -07:00
Cory Wright
fbac0a984b fixes #7827 - String formatting is broken for mysql_grants.absent 2013-10-14 17:36:51 -04:00
Pedro Algarvio
fa0573d5f5 Update the translation doc to mention the Makefile target. 2013-10-14 22:20:00 +01:00
Pedro Algarvio
8d40a3037b Include the translating document in a toctree. 2013-10-14 22:19:24 +01:00
Pedro Algarvio
13ee3a59bb Add a download-translations target to the Makefile. 2013-10-14 22:05:23 +01:00
Colton Myers
8b4981c703 Merge pull request #7823 from basepi/hwmdefaults 
Set the 'pub_hwm' .get defaults to match the config default
 2013-10-14 13:57:02 -07:00
Colton Myers
d78c1c250e Set the 'pub_hwm' .get defaults to match the config default 2013-10-14 14:56:06 -06:00
Pedro Algarvio
e3fecabcbe Add information on how to build a localized version of the documentation. 2013-10-14 21:14:33 +01:00
Pedro Algarvio
1be51814a5 Provide a script to simplify the translations download process. 2013-10-14 21:02:23 +01:00
David Boucha
7790d914f5 Merge pull request #7822 from mgwilliams/carbon-return 
carbon-returner: make it more flexible
 2013-10-14 12:56:37 -07:00
Matthew Williams
e39f9c1f8d carbon-returner: make it more flexible 2013-10-14 19:53:46 +00:00
Pedro Algarvio
0bd6ad6f8e Switch to anonymous links, simplifies translations. 2013-10-14 20:35:23 +01:00