Thomas S Hatch
9cb46dd61d
Merge pull request #14936 from cachedout/ckminion_stats
...
Reduce unnecessary stats in minion cache
2014-08-13 16:06:07 -06:00
Thomas S Hatch
58517a96cc
Merge branch '2014.7' into develop
2014-08-13 15:46:17 -06:00
Thomas S Hatch
48da5f486d
Merge pull request #14969 from thatch45/2014.7
...
Add template files to manifest so they get included
2014-08-13 15:45:34 -06:00
Thomas S Hatch
b755ed1c84
Add template files to manifest so they get included
...
in python 2.6 builds because package_data was changed in 2.7
2014-08-13 15:44:25 -06:00
Thomas S Hatch
2aa208f636
Merge pull request #14930 from whiteinge/doc-event-fire_master_env-sudo
...
Update event.fire_master_env docstring with sudo instructions
2014-08-13 10:38:39 -06:00
Thomas S Hatch
80a7c85b03
Merge pull request #14901 from Nibbler999/fix-custom-grains-override
...
Fix custom grains override
2014-08-13 10:35:26 -06:00
Colton Myers
fb189dae63
Merge branch '2014.7' into develop
2014-08-13 10:26:20 -06:00
Colton Myers
6e3a83fbad
Merge pull request #14931 from basepi/rcdocs
...
Add installation docs for Salt release candidate
2014-08-13 10:25:23 -06:00
Colton Myers
fab84fa831
Merge pull request #14940 from rallytime/fix_pillar_tests
...
Fix pillar mysql tests
2014-08-13 10:05:52 -06:00
Thomas S Hatch
35b654c2c5
Merge pull request #14942 from UtahDave/2014.7temp
...
Fix unicode output error on Windows salt-call
2014-08-13 09:54:38 -06:00
Joseph Hall
6a0bfbf11f
Merge pull request #14959 from s0undt3ch/2014.7
...
Remove unused imports and fix white-space lint issues.
2014-08-13 09:43:29 -06:00
Pedro Algarvio
c3b064b717
Remove unused imports and fix white-space lint issues.
2014-08-13 16:42:36 +01:00
Joseph Hall
25352b93a9
Merge pull request #14954 from mcalmer/fix-zypper-set-autorefresh
...
fix set autorefresh in zypper module
2014-08-13 07:10:59 -06:00
Michael Calmer
fd8f0370bf
fix set autorefresh in zypper module
...
fix:
"Failed to configure repo '<reponame>': in method
'RepoInfoBase_setAlias', argument 2 of type 'std::string const &'"
2014-08-13 14:59:29 +02:00
Thomas S Hatch
252dda4708
Merge branch '2014.7' into develop
2014-08-12 19:20:09 -06:00
Thomas S Hatch
d13ae8c626
Merge pull request #14949 from cro/fileclient_extnodes
...
Ensure external nodes no longer referenced even though it could not be used for evil.
2014-08-12 19:16:15 -06:00
C. R. Oldham
b116d09423
Ensure external_nodes is no longer referenced even though it could not be used for evil.
2014-08-12 19:10:32 -06:00
C. R. Oldham
baa1b324f8
Merge to develop (pylint fix)
2014-08-12 18:57:00 -06:00
C. R. Oldham
e46db61f7a
Merge to develop (pylint fix)
2014-08-12 18:48:55 -06:00
C. R. Oldham
ef8e23906f
Merge pull request #14945 from cro/ldap_metacharacters6
...
Pylint fix.
2014-08-12 18:47:25 -06:00
Thomas S Hatch
d92f468c72
Merge branch '2014.7' into develop
2014-08-12 18:47:25 -06:00
C. R. Oldham
19c8866976
PyLint fix.
2014-08-12 18:46:42 -06:00
Thomas S Hatch
73d3ba3fa8
Merge pull request #14944 from cro/ldap_metacharacters6
...
Ensure ldap characters are properly escaped
2014-08-12 18:35:26 -06:00
C. R. Oldham
c3cd30756c
Ensure external_nodes is no longer referenced even though it could not be used for evil.
2014-08-12 18:28:16 -06:00
C. R. Oldham
4563b26b5c
Ensure ldap parameters are properly escaped
2014-08-12 18:04:38 -06:00
David Boucha
1e2846551d
Fix unicode output error on Windows salt-call
...
Fixes #14695
2014-08-12 17:08:53 -06:00
rallytime
b579247646
Add no_mock/_reason and ensure_in_syspath
2014-08-12 16:48:01 -06:00
rallytime
a0233b3ebf
Fix pillar mysql test formatting
2014-08-12 16:44:33 -06:00
Mike Place
9695c6e212
Reduce unnecessary stats in minion cache
...
Refs #14645
Instead of doing two seperate FS operations to check for the existence
of a file and then open in, simply attempt the file open and continue if
it fails. Should save one stat per operation.
This is a relatively minor optimmization but in cases of a master with
many minions, could have noticeable performance improvements when
iterating over tens of thousands of files.
2014-08-12 16:24:55 -06:00
Colton Myers
788ed4606f
Reword some things
2014-08-12 15:08:02 -06:00
Colton Myers
51917ee017
Add installation docs for Salt release candidate
2014-08-12 14:53:21 -06:00
Seth House
f15071ec5f
Update event.fire_master_env docstring with sudo instructions
2014-08-12 16:43:28 -04:00
Colton Myers
bbf724dcce
Merge branch '2014.7' into develop
...
Conflicts:
salt/minion.py
2014-08-12 14:17:01 -06:00
Colton Myers
19cf82fd5f
Merge branch '2014.7' into develop
...
Conflicts:
doc/topics/transports/raet/index.rst
salt/minion.py
2014-08-12 14:15:50 -06:00
Colton Myers
5221be7029
Merge pull request #14929 from cachedout/fix_14099
...
Guh. Typoed earlier and forgot to remove.
2014-08-12 14:08:08 -06:00
Mike Place
2643c9f345
Guh. Typoed earlier and forgot to remove.
2014-08-12 14:06:48 -06:00
Thomas S Hatch
94fc092bed
Merge pull request #14914 from garethgreenaway/14911_ip_interfaces_show_ipv6
...
update to ip_interfaces grain
2014-08-12 13:20:11 -06:00
Thomas S Hatch
63f734643a
Merge pull request #14924 from jond64/mysql-ext_pillar
...
ignore_null option for mysql external pillar
2014-08-12 13:15:04 -06:00
Thomas S Hatch
a806a33626
Merge pull request #14921 from nmadhok/patch-1
...
Update formulas.rst
2014-08-12 13:13:18 -06:00
Thomas S Hatch
6be9af140c
Merge pull request #14919 from rallytime/fix_postgres_tests
...
Add suffix 'd' or 'ed' depending on last letter
2014-08-12 13:12:56 -06:00
Thomas S Hatch
7f872e4a6c
Merge pull request #14908 from thusoy/increase-hash-chunk-size
...
Increase hash chunk size 4kB->64kB
2014-08-12 12:07:29 -06:00
Thomas S Hatch
06cff4bb18
Merge pull request #14905 from UtahDave/update_esky
...
Fix esky updates
2014-08-12 11:46:40 -06:00
Thomas S Hatch
a6f21e140a
Merge pull request #14904 from cachedout/fix_14099
...
Continue if master in multi-master is down
2014-08-12 11:46:01 -06:00
Thomas S Hatch
1a5c0c5dca
Merge pull request #14895 from whiteinge/npm-cleanup
...
Fix npm test; npm state pylint fix
2014-08-12 11:44:42 -06:00
Thomas S Hatch
16dfe58633
Merge pull request #14923 from thatch45/lyft-boto-cloudwatch
...
Lyft boto cloudwatch
2014-08-12 11:31:41 -06:00
Thomas S Hatch
873c75593c
Add CLI Example
2014-08-12 11:30:40 -06:00
Thomas S Hatch
d352004c01
Merge branch 'boto-cloudwatch' of https://github.com/lyft/salt into lyft-boto-cloudwatch
2014-08-12 11:28:51 -06:00
jond64
4c42ca6a69
ignore_null option for mysql external pillar
2014-08-12 12:26:13 -05:00
Thomas S Hatch
4a0f0cfdc1
Merge pull request #14922 from thatch45/2014.7
...
update raet install docs for 2014.7
2014-08-12 11:25:41 -06:00
Nitin Madhok
f99dac462b
Update formulas.rst
...
Fixes https://github.com/saltstack/salt/issues/14900
2014-08-12 13:18:48 -04:00
