valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,453 Commits 24 Branches 182 Tags 341 MiB
c673d06f48
Commit Graph

78453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ionuț Ciocîrlan
ebe2c3e83b grammar in states/top.rst 2017-02-17 00:26:45 +02: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
Mike Place
b17931a653 Merge pull request #39455 from UtahDave/develop 
add Salt Enterprise photo
 2017-02-16 12:39:20 -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
David Boucha
570e14250d add Salt Enterprise photo 2017-02-16 11:50:28 -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
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
Ari Maniatis
4af0514def Improve introduction to explain the purpose of orchestration 
Before diving into technical details tell the user why they want this feature.
 2017-02-16 18:52:05 +11:00
Mike Place
05de98e237 Merge pull request #39342 from jccomputing/detach 
dockerng: fix documentation for detach's default value
 2017-02-15 17:11:54 -07:00
Mike Place
16332ae957 Merge pull request #39433 from twangboy/win_new_tests 
Add additional tests to the Windows whitelist
 2017-02-15 17:03:17 -07:00
Nicole Thomas
070904b719 Merge pull request #39428 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-15 17:01:15 -07:00
Mike Place
dfe1c26b64 Merge pull request #39434 from techhat/spmrepoversion 
Add version control to SPM repo creation
 2017-02-15 16:58:43 -07:00
Christian McHugh
4bb54157e6 Have mysql state error out on non-existant file 2017-02-15 23:56:26 +00:00
Mike Place
822cfb80cd Merge pull request #39413 from eradman/statefail 
Report failures when salt-run is unable to communicate with minions
 2017-02-15 16:41:23 -07:00
twangboy
2e9122e134 Fix fileserver.fileclient reference 2017-02-15 22:44:09 +00:00
rallytime
2acb188ac9 Change `path` value from a tuple to a list 
The type of the ``path`` value changed in #38188.

This updates the type in the unit test, as well as rearranges some
of the imports to be more standardized with ``ensure_in_syspath``.
 2017-02-15 15:39:53 -07:00
Nicole Thomas
54a572e50c Merge pull request #39429 from rallytime/bp-39364 
Back-port #39364 to 2016.11
 2017-02-15 14:27:21 -07:00
twangboy
98d5cc3e1b Add additional tests to the Windows whitelist 2017-02-15 21:21:55 +00:00
Joseph Hall
b34d42f98c Add version control to SPM repo creation 2017-02-15 14:21:03 -07:00
Daniel Wallace
157f4dcdf9 set default user variable to the user cmd runs as 2017-02-15 13:07:44 -07:00
Mike Place
a0bd04b392 Merge pull request #39194 from bodhi-space/infra1963 
INFRA-1963 - add boto3_route53 exec and state modules
 2017-02-15 13:03:26 -07:00
Mike Place
64e164dcbc Merge pull request #39364 from gtmanfred/default_user 
set default user variable to the user cmd runs as
 2017-02-15 12:48:55 -07:00
toller
88741021ad Fix typo and newlines in log messages. 2017-02-15 12:33:56 -07:00
Jean-Claude Computing
94f349a900 Fix documentation for detach's default value 2017-02-15 20:29:29 +01:00
Mike Place
881ebf2e93 Merge pull request #39424 from twangboy/win_fix_dos 
Fix problem with too many connection attempts in Windows
 2017-02-15 11:51:34 -07:00
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
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -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
47872355a8 Merge pull request #39419 from The-Loeki/bp-ssh-ipv6 
Backport Salt-SSH IPv6 fixes to 2016.11
 2017-02-15 10:33:12 -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