Commit Graph

35613 Commits

Author SHA1 Message Date
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
Nitin Madhok
4144da61bf Fixing more sphinx warnings and errors 2014-08-11 14:38:45 -04:00
Seth House
6318b94fc4 Removed unused format() arg in npm state
Closes #14885. Thanks @cvrebert.
2014-08-11 14:18:54 -04:00
Nitin Madhok
07e219b6db Fixing more sphinx warnings and errors 2014-08-11 14:08:19 -04:00
Joseph Hall
c511531c66 Merge pull request #14894 from hulu/suse-copyedit
fix typo: Feauture => Feature
2014-08-11 12:02:58 -06:00
Joseph Hall
e3a5a21a17 Merge pull request #14893 from hulu/copyedit-Debian
fix typo: Debain => Debian
2014-08-11 12:02:30 -06:00
Chris Rebert
baa4f852df fix typo: Feauture => Feature 2014-08-11 11:00:23 -07:00
Chris Rebert
fede2f6f9b fix typo: Debain => Debian 2014-08-11 10:58:55 -07:00
Chris Rebert
b7ce0dbe60 more typos after disabling case-sensitivity 2014-08-11 10:57:41 -07:00
Nitin Madhok
7606bfd6cc Fixing more sphinx warnings and errors 2014-08-11 13:56:43 -04:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Thomas S Hatch
d12b79092e Merge branch '2014.7' into develop 2014-08-11 11:44:38 -06:00
Thomas S Hatch
72214d9a5c Merge pull request #14891 from cachedout/tty_move
Write directly to tty
2014-08-11 11:44:05 -06:00
Thomas S Hatch
787827618b Merge branch '2014.7' into develop 2014-08-11 11:43:33 -06:00
Nitin Madhok
78b002fc43 Improving docs for salt.modules.oracle 2014-08-11 13:31:19 -04:00
Chris Rebert
c0747eb938 partial copyediting of salt.utils.aggregation 2014-08-11 10:21:45 -07:00
Chris Rebert
75d28df71d Begone, "allows to" (sic) ! 2014-08-11 10:20:28 -07:00
Nitin Madhok
6e97740ace Improving docs for salt.modules.lxc 2014-08-11 13:14:28 -04:00
Thomas S Hatch
14fd5ef1af Merge pull request #14881 from Nibbler999/unused-variable-errors
Remove unused variable
2014-08-11 11:07:02 -06:00
Thomas S Hatch
525e642865 Merge pull request #14869 from garethgreenaway/14795_recurse_directory
Additions to state file.py
2014-08-11 11:06:28 -06:00
Thomas S Hatch
81c81c3389 Merge pull request #14887 from kaithar/feature/add-test-for-source
Don't try to clean up sfn if it isn't set.
2014-08-11 11:01:34 -06:00
Thomas S Hatch
0abe9a6c02 Merge pull request #14882 from thusoy/chunked-hashing
Use salt.utils.get_hash also in local client
2014-08-11 11:00:54 -06:00
Thomas S Hatch
daa924ebb7 Merge pull request #14878 from s0undt3ch/hotfix/exc-info-per-handler
[2014.7] Allow the inclusion of `exc_info` on a per handler basis.
2014-08-11 10:59:14 -06:00
Mike Place
7a6e9c15a6 Write directly to tty
Conflicts:
	salt/modules/cmdmod.py
2014-08-11 10:57:59 -06:00
Thomas S Hatch
9e2b6c178e Merge pull request #14873 from Nibbler999/batch-static
Support static option in batch mode
2014-08-11 10:50:17 -06:00
Nitin Madhok
41712eab04 Fixing more sphinx warnings and errors 2014-08-11 12:33:55 -04:00
Nitin Madhok
937a607448 Fixing more sphinx warnings and errors 2014-08-11 12:16:01 -04:00
Nitin Madhok
ed175b3660 Improving docs for salt.modules.win_update 2014-08-11 11:47:58 -04:00
Nitin Madhok
9ec9ee92c9 Improving docs for salt.modules.tls 2014-08-11 11:31:56 -04:00