Commit Graph

78272 Commits

Author SHA1 Message Date
Daniel Wallace
d332b33c8a add extmod_blacklist to make it easier to remove modules 2017-02-15 12:47:32 -06:00
Mike Place
ff7aa83532 Merge pull request #39414 from Unity-Technologies/hotfix/salt-cloud-windows-dev
Added a way to override the default used transport for winrm
2017-02-15 10:40:18 -07:00
Mike Place
9e88357f3e Merge pull request #39410 from cetanu/develop
allow non-hostname characters in vmware obj name
2017-02-15 10:35:02 -07:00
Mike Place
b79bf15b64 Merge pull request #39407 from techhat/spmver
Add package version control to SPM
2017-02-15 10:29:28 -07:00
Daniel Hobley
c1c19a8731 Added a way to override the default used transport for winery
- Delete temporary files with winrm instead of using smb
2017-02-15 10:14:04 +01:00
Vasili Syrakis
6faa03431b allow non-hostname characters in vmware obj name 2017-02-15 11:05:34 +11:00
Pedro Algarvio
fc59d5e832 Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment

* First convert to string if not already a string. Then to bytes under Py3.

The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.

* Mark tests which require root permissions to run

* Allow declaring that the function IS a class method.

```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
...     def bar(self):
...         print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```

On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.

* Always decode responses to the Python version native string implementation

* Just compare the objects as matching list.

Asserting same item count doesn't make that much sense.

* Py3 compatibility

* Fix saltnado tests under Py3

* Python 3 compatibility

* Show me the full traceback

* Revert "Convert fileserver data from bytes to strings"

This reverts commit e53972f8c6.

* Revert "Under Py3, we get `bytes` when using the roots backend directly"

This reverts commit 9f73b240c1.

* Convert from bytes to str if not a binary file

* Py3 compatibility fixes.

Convert file contents from bytes to string if not a binary file
2017-02-14 16:20:56 -07:00
Joseph Hall
b5d56890ce Add list commands to SPM (#39401) 2017-02-14 16:14:46 -07:00
Joseph Hall
fc0366dfee Move dl_list to proper scope 2017-02-14 16:10:21 -07:00
Joseph Hall
ad7d7e60df Add package version control to SPM 2017-02-14 14:09:22 -07:00
Joseph Hall
03a6a9e9cf Fix Aliyun lint errors (#39403)
* Fix Aliyun lint errors

* Bad spacing

* More bad spacing
2017-02-14 13:49:57 -07:00
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