Daniel Hobley
4eaacbd339
Don't add a disk if it's None to the device specs
2017-02-17 10:46:27 +01:00
Andreas Lutro
246bf1e938
add failhard argument to various apt pkg functions
...
currently, it's not possible to query for info on packages that may not
be installed. with an added failhard argument, the user can specify if
they just want an empty result set back instead of an exception being
raised.
2017-02-17 10:06:26 +01:00
yangang
d794f2182e
here should be 'Error' in info
2017-02-17 16:04:00 +08:00
Vasili Syrakis
93cb6117fc
fix OrderedDict being passed into _get_size_spec
2017-02-17 16:27:35 +11:00
Vasili Syrakis
616633c9bf
OrderedDict being passed into _get_size_spec
2017-02-17 16:20:02 +11:00
twangboy
167cdb3447
Gate windows specific imports, add __virtual__
2017-02-16 17:50:47 -07:00
Mike Place
3fc1e2c9f8
Merge pull request #39372 from twangboy/gate_win_utils_dev
...
Gate the win_dacl util
2017-02-16 16:54:33 -07:00
Vasili Syrakis
6d6095e51e
str.split takes no keyword arguments in python 2.7
2017-02-17 10:29:52 +11:00
Vasili Syrakis
cd1cf1fb02
fix PR#39410
...
if opts['name'] doesn't contain a .DOMAIN.TLD, this will fail to unpack 2 values
2017-02-17 10:23:18 +11:00
twangboy
812c857770
Fix test_init for Windows
2017-02-16 16:00:45 -07:00
Mike Place
35566a8824
Merge pull request #39449 from cloudflare/port-38682
...
[Nitrogen] Port #38682
2017-02-16 15:51:11 -07:00
Mike Place
964c539cb8
Merge pull request #39466 from xlotlu/patch-1
...
grammar in states/top.rst
2017-02-16 15:48:52 -07:00
Mike Place
7dd2502360
Merge pull request #39464 from gtmanfred/2016.3
...
skip false values from preferred_ip
2017-02-16 15:48:32 -07:00
Mike Place
2e3a9c5e58
Merge pull request #39456 from twangboy/win_fix_icon
...
Add salt icon to buildenv directory
2017-02-16 15:47:58 -07:00
Mike Place
63adc03484
Merge pull request #39462 from twangboy/win_fix_fileclient
...
Use url_path instead of url_data.path
2017-02-16 15:44:18 -07:00
Ionuț Ciocîrlan
ebe2c3e83b
grammar in states/top.rst
2017-02-17 00:26:45 +02:00
Mike Place
e9b034f02f
Merge pull request #39458 from rallytime/fixup-more-doc-build-warnings
...
Fix more warnings in doc build
2017-02-16 14:45:51 -07:00
Nicole Thomas
1577bb68af
Merge pull request #39459 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-02-16 14:30:31 -07:00
Daniel Wallace
f829d6f9fc
skip false values from preferred_ip
2017-02-16 15:11:08 -06:00
Mike Place
e4f8c2bfb0
Merge pull request #39437 from sakateka/fixes_about_saltfile
...
Fixes about saltfile
2017-02-16 13:32:14 -07:00
twangboy
a96bc13133
Use url_path instead of url_data.path
2017-02-16 13:20:23 -07:00
Mike Place
b17931a653
Merge pull request #39455 from UtahDave/develop
...
add Salt Enterprise photo
2017-02-16 12:39:20 -07:00
Mike Place
db359ff2c3
Merge pull request #39460 from cachedout/win_dism_test_fix
...
Fix mocks in win_disim tests
2017-02-16 12:27:47 -07:00
Mike Place
e652a45592
Fix mocks in win_disim tests
2017-02-16 12:26:49 -07:00
Mike Place
649e9f041f
Merge pull request #39453 from rallytime/remove-test-globals
...
Remove global dunder definitions from tests
2017-02-16 12:22:47 -07:00
rallytime
dda39d4e63
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/file.py
- salt/modules/grains.py
- salt/utils/gitfs.py
2017-02-16 12:18:46 -07:00
twangboy
8dd915dae4
Add salt icon to buildenv directory
2017-02-16 12:04:21 -07:00
David Boucha
570e14250d
add Salt Enterprise photo
2017-02-16 11:50:28 -07:00
rallytime
e698bc3508
Fix more warnings in doc build
2017-02-16 11:20:35 -07:00
Megan Wilhite
1acf00da3b
add 2016.11.3 changelog to release notes ( #39451 )
2017-02-16 10:49:53 -07:00
rallytime
3a8bd786e0
Remove global dunder definistions from tests
...
These dunders are already being mocked appropriately below in the test, so we
don't need to define them in the test module's namespace.
The global definitions here were conflicting with the globals defined in
`saltmod_test.py`, and causing the following stacktrace in the test suite:
```
Traceback (most recent call last):
File "/root/SaltStack/salt/tests/unit/saltmod_test.py", line 71, in test_state
self.assertDictEqual(saltmod.state(name, tgt, highstate=True), test_ret)
File "/root/SaltStack/salt/salt/states/saltmod.py", line 252, in state
masterless = __opts__['__role'] == 'minion' and \
KeyError: '__role'
```
2017-02-16 10:33:32 -07:00
Mike Place
8e2cbd2307
Merge pull request #39448 from gtmanfred/2016.11
...
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:29:47 -07:00
Sergey Kacheev
ab68524d7a
less pylint: salt/utils/parsers.py
2017-02-17 00:25:04 +07:00
Sergey Kacheev
9e7d9dcc78
Revert "pylint: salt/utils/parsers.py"
...
This reverts commit 33f3614b1e
2017-02-17 00:15:57 +07:00
Mike Place
41c046308c
Remove #
2017-02-16 10:07:25 -07:00
Mike Place
388d3c2fad
Merge pull request #39435 from mchugh19/develop
...
Have mysql state error out on non-existant file
2017-02-16 10:04:12 -07:00
Mike Place
d63539b44f
Merge pull request #39436 from ari/patch-1
...
Improve introduction to explain the purpose of orchestration
2017-02-16 10:02:51 -07:00
Mike Place
091b233fe6
Merge pull request #39442 from cloudflare/napalm_host_grain
...
Enhance NAPALM grains
2017-02-16 09:51:01 -07:00
Mircea Ulinic
d26c1c2c9d
Port f847639dee into Nitrogen
2017-02-16 16:19:31 +00:00
Daniel Wallace
3172e88700
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:05:33 -06:00
Mircea Ulinic
30995955ce
Include doc
2017-02-16 16:04:40 +00:00
Mircea Ulinic
ec5a43c9e6
Add doc for the new napalm execution module
2017-02-16 16:04:40 +00:00
Mircea Ulinic
e6231f0552
Rename napalm_proxy module to napalm
2017-02-16 16:04:40 +00:00
Mircea Ulinic
ec94c78a2b
Add call feature for testing
2017-02-16 16:04:40 +00:00
Mircea Ulinic
65bdc08595
Transform for Nitrogen
2017-02-16 16:04:40 +00:00
Mike Place
8723caa710
Merge pull request #39443 from cloudflare/napalm_keepalive
...
NAPALM proxy: add alive function for proxy keepalive
2017-02-16 08:28:35 -07:00
Mircea Ulinic
4c503c5da5
NAPALM proxy functions
2017-02-16 14:59:17 +00:00
Mircea Ulinic
882bdd9697
NAPALM proxy: add alive function for proxy keepalive
2017-02-16 13:24:26 +00:00
Mircea Ulinic
f778ecc1be
Enhance NAPALM grains
2017-02-16 12:44:42 +00:00
Mircea Ulinic
8453800639
file.get_managed: refetch cached file when hashsum chnaged
2017-02-16 11:31:31 +00:00
