Nicole Thomas
3a39e15dff
Rewrite blockdev unit test to target more specific state returns ( #39402 )
...
The previous way this test was written was over-mocking some of the
state returns as well as tested and asserted against incorrect
behavior as shown in issue #39255 . (The test asserted that a return
of '' from the call to _checkblk() was correct, which was hiding a
bug as noted in #39255 and fixed in #39272.)
2017-02-14 13:49:14 -07:00
Mike Place
09c29b3405
Merge pull request #39301 from twangboy/win_iis
...
Additional functions to win_iis module
2017-02-14 11:58:06 -07:00
Mike Place
370b3409ad
Merge pull request #39351 from ninja-/reduce_fileclient_latency
...
Reduce fileclient latency by merging _file_hash and _find_file
2017-02-14 11:55:22 -07:00
Mike Place
868e170b92
Merge pull request #39376 from jmickle/develop
...
adding librato metrics returner
2017-02-14 11:39:34 -07:00
Mike Place
2b67008770
Merge pull request #39374 from techhat/spmcache
...
Switch SPM to salt.cache
2017-02-14 10:58:10 -07:00
Mike Place
12b92511f9
Merge pull request #39388 from steinliber/repair_aliyun_api_problem
...
Repair aliyun api problem
2017-02-14 10:56:59 -07:00
Mike Place
471baea629
Merge pull request #39381 from cachedout/docs_fix
...
Docs test fix
2017-02-14 10:53:27 -07:00
Mike Place
359fc24500
Merge pull request #39398 from ccin2p3/bug32207
...
Fix gpg renderer when called without tty.
2017-02-14 10:53:00 -07:00
Erik Johnson
a557422516
Merge pull request #39290 from mephi42/32356
...
Support globbing in sources parameter of salt.modules.archive (#32356 )
2017-02-14 10:38:37 -06:00
twangboy
d0240e7c7d
Clarify docs for create_site
2017-02-14 09:37:30 -07:00
Foudil BRÉTEL
d1e40d900b
Fix gpg renderer when called without tty.
2017-02-14 16:39:51 +01:00
stein
cb3273b863
reapair error
2017-02-14 14:52:04 +08:00
Jonathan Mickle
3975429f48
more pep8 stuff
2017-02-13 22:30:10 -08:00
Jonathan Mickle
e270e9586b
linter fixes
2017-02-13 22:28:49 -08:00
Jonathan Mickle
3a75abad6b
this try is unnecesarry
2017-02-13 17:38:37 -08:00
Jonathan Mickle
20b522033f
linter fixes
2017-02-13 16:07:40 -08:00
Joseph Hall
ff763b0515
Add repo commands to SPM ( #39375 )
...
* Add repo commands to SPM
* Add package versions to repo packages list
* Add package search to repo command
2017-02-13 17:04:13 -07:00
Joseph Hall
4f072c9ad8
Add cache default for spm
2017-02-13 16:59:07 -07:00
Mike Place
89ed6a38f7
Typo
2017-02-13 16:46:53 -07:00
Mike Place
8fbbb781bc
Fix docs test
2017-02-13 16:45:47 -07:00
Jonathan Mickle
ec938e5f73
linter fixes
2017-02-13 15:27:07 -08:00
Joseph Hall
309d930e91
Linting
2017-02-13 16:09:31 -07:00
mephi42
6570392abd
Support globbing in sources parameter of salt.modules.archive ( #32356 )
...
Add globbing support to tar, zip and rar.
Update tests to show bad return value on error.
2017-02-14 00:02:19 +01:00
Jonathan Mickle
916b220676
adding second dimension example
2017-02-13 14:35:57 -08:00
Jonathan Mickle
d61865c2bc
adding librato metrics returner
2017-02-13 14:18:54 -08:00
Joseph Hall
64dac25302
Switch SPM to salt.cache
2017-02-13 15:03:39 -07:00
Mike Place
3ec9e043fa
Merge pull request #39306 from markuskramerIgitt/writing_documentation
...
rst table requires plus-signs for column
2017-02-13 14:59:08 -07:00
Mike Place
d037045653
Merge pull request #39274 from markuskramerIgitt/develop
...
Optionally format version conforming to Windows msi numbering scheme.
2017-02-13 14:48:16 -07:00
Mike Place
dcd9ff471f
Merge pull request #39302 from terminalmage/loader-virtual-aliases
...
Add __virtual_aliases__ feature to the loader
2017-02-13 13:22:02 -07:00
Mike Place
7b2f6088b7
Merge pull request #39366 from dglloyd/patch-1
...
Pass sig to service.status in after_toggle
2017-02-13 13:19:49 -07:00
Mike Place
1951216b22
Merge pull request #39320 from s0undt3ch/features/py3
...
Py3 Fixes
2017-02-13 12:28:32 -07:00
Pedro Algarvio
718afddf51
Don't use repr
2017-02-13 19:23:58 +00:00
Mike Place
547498f8db
Merge pull request #39319 from bricewge/develop
...
fix #39318
2017-02-13 11:56:56 -07:00
Mike Place
fbb6cddcc2
Merge pull request #39330 from steinliber/repair_aliyun_api_problem
...
repair aliyun api problem
2017-02-13 11:51:12 -07:00
Mike Place
4aab734c58
Merge pull request #39332 from morganwillcock/shutdown-state
...
Add shutdown and reboot functions to win_system state module
2017-02-13 11:50:05 -07:00
Mike Place
1b5c1fcb21
Merge pull request #39352 from Unity-Technologies/hotfix/adb_no_devices
...
Fix adb beacon when there are no devices
2017-02-13 10:46:37 -07:00
Dan Lloyd
bbe0389692
Pass sig to service.status in after_toggle
...
As on line 350, pass `sig` to `service.status` to ensure that the correct behavior is used. If we don't pass `sig`, upstart/sysv jobs that do not implement `service <name> status` will fail.
2017-02-13 12:39:09 -05:00
Pedro Algarvio
5ade2a6854
Fix inspect code under Py3 and a little more helpful error message.
2017-02-13 16:52:13 +00:00
Pedro Algarvio
9f73b240c1
Under Py3, we get bytes when using the roots backend directly
2017-02-13 16:44:30 +00:00
Pedro Algarvio
e53972f8c6
Convert fileserver data from bytes to strings
2017-02-13 16:44:09 +00:00
William Giokas
0647dc8aab
doc: Fix the Nix documentation ( #39343 )
2017-02-13 09:42:37 -07:00
Mike Place
41220e799f
Merge pull request #39356 from cloudflare/table_out_fix
...
Fix table outputter opts
2017-02-13 09:27:06 -07:00
Pedro Algarvio
ff1667c6d6
We really don't need to decode the string prior to writing it to file.
...
Plus, this also avoids handling Py2 and Py3 differently.
2017-02-13 16:25:09 +00:00
Pedro Algarvio
89e67f0934
We need to feed bytes to the hash function under Py3
2017-02-13 16:19:02 +00:00
Mircea Ulinic
6539f4b86b
Fix table outputter opts
2017-02-13 13:09:10 +00:00
Daniel Hobley
3a3ef25b51
Fix add beacon when there are no devices
...
- Changed the assumption that having 0 lines means there are no devices, to actually checking there are no devices
2017-02-13 13:33:52 +01:00
Morgan Willcock
ea6b7ed5af
lint fixes
2017-02-13 11:00:01 +00:00
ninja-
94c62388e7
Reduce fileclient.get_file latency by merging _file_find and _file_hash
...
This commit uses the newly created _file_hash_and_stat master function.
This is especially useful if your master and minion servers are in another datacenter (in my case the ping latency between them is 10ms, which somehow makes it around 40ms to access full file metadata)
This time is now cut in half. Yay!
2017-02-13 11:56:32 +01:00
Pedro Algarvio
8e5a31f0d1
Use six.moves.StringIO
2017-02-13 10:18:58 +00:00
Pedro Algarvio
005f21d3b5
Compare against the normalized mode string
2017-02-13 10:18:58 +00:00
