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
35,539 Commits 24 Branches 182 Tags 341 MiB
4f31e86392
Commit Graph

35539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas S Hatch
05f4d0f7a8 update raet install docs for 2014.7 2014-08-12 11:16:53 -06:00
rallytime
201417a067 Add suffix 'd' or 'ed' depending on last letter 2014-08-12 09:48:34 -06:00
rallytime
d57fc99bca Move mock_ec2 decorator back to functions 2014-08-12 09:20:17 -06:00
Joseph Hall
619873cc13 Merge pull request #14913 from jeffrey4l/develop 
Fix the wrong keystone.tenant_update param
 2014-08-12 09:06:11 -06:00
Gareth J. Greenaway
5392236d5b updating the ip_interfaces grain to include ipv6 addresses. 2014-08-11 21:03:35 -07:00
Lei Zhang
e68b57884a Fix the wrong keystone.tenant_update param 
There is a description param rather than email param in tenant.
 2014-08-12 11:31:12 +08:00
David Boucha
635a82d957 Fix esky updates 2014-08-11 19:13:18 -06:00
Thomas S Hatch
1930852c9f Merge pull request #14910 from thatch45/2014.7 
No pending arg exists anymore
 2014-08-11 17:40:26 -06:00
Thomas S Hatch
74c0c1e7f7 No pending arg exists anymore 2014-08-11 17:39:40 -06:00
rallytime
5fff2f9b3f Rename boto tests files to include '_test' at the end 2014-08-11 17:01:42 -06:00
Nicole Thomas
64ee26aa57 Merge pull request #14897 from rallytime/boto_test_fixes 
Update imports and skipIfs on boto unit tests
 2014-08-11 17:01:01 -06:00
Seth House
304d76938c Merge pull request #14902 from cachedout/ignore_grains 
Git ignore
 2014-08-11 18:26:41 -04:00
Seth House
c9390ebb00 Merge pull request #14907 from cachedout/doc_master_proc 
Explain the number of master procs and worker_threads
 2014-08-11 18:26:23 -04:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Tarjei Husøy
dd35be954a Increase hash chunk size 4kB->64kB 
Ref. discussion in #14784.
 2014-08-12 00:13:24 +02:00
Mike Place
a352cc4521 Explain the number of master procs and worker_threads 
Refs #13819
 2014-08-11 16:09:02 -06:00
Nicole Thomas
92054dbe8b Merge pull request #5 from s0undt3ch/hotfix/rally-boto 
Bring the global variables more into their context
 2014-08-11 15:55:28 -06:00
Mike Place
7572012313 Continue if master in multi-master is down 2014-08-11 15:28:03 -06:00
Pedro Algarvio
09acfae48e Bring the global variables more into their context 2014-08-11 22:25:21 +01:00
Mike Place
10f7a5170c Git ignore 2014-08-11 14:32:17 -06:00
Tom Atkinson
bab2331d6e Allow custom grains to overwrite core grains 2014-08-11 22:22:24 +02:00
Tom Atkinson
589a220b9a Fix string prefix check 2014-08-11 22:21:01 +02:00
Seth House
4a72be9d7e Merge pull request #14890 from nmadhok/improve-salt-modules 
Improve Salt Docs
 2014-08-11 16:00:24 -04:00
Ryan Lane
90a2b9d9f6 String substitution lint fixes 2014-08-11 12:39:06 -07:00
Ryan Lane
07529bc171 Fixes based on comments 2014-08-11 12:32:36 -07:00
Seth House
9ab56602d8 Merge pull request #14896 from hulu/retreived-sic 
fix "retreived" typos
 2014-08-11 15:26:31 -04:00
Nitin Madhok
43289d1834 Fixing pylint violations 2014-08-11 15:23:57 -04:00
rallytime
cc5c3bc1ad Update imports and skipIfs on boto unit tests 2014-08-11 12:57:45 -06:00
Chris Rebert
7da0f0a8b6 fix "retreived" typos 2014-08-11 11:52:30 -07:00