valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,797 Commits 24 Branches 182 Tags 341 MiB
f723bf731a
Commit Graph

83797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
f723bf731a Remove root_user kwarg from bootstrap function in manage runner 
This option was marked for removal in Oxygen. The bootstrap function
now relies on salt-ssh with roster entries instead.
 2017-07-21 10:56:30 -06:00
Mike Place
026f0e519c Merge pull request #42432 from alexbleotu/esxdatacenter_states-gh 
datacenter_configured state function
 2017-07-20 17:24:00 -05:00
Mike Place
01fb4f35c7 Merge pull request #42395 from rallytime/no-more-nitrogen 
Fix some Nitrogen references still present in develop
 2017-07-20 16:45:45 -05:00
Alexandru Bleotu
d5b6c6be25 Fixed pylint 2017-07-20 21:06:35 +01:00
Alexandru Bleotu
5a63ed7449 Added tests for datacenter_configured state 2017-07-20 16:43:44 +01:00
Alexandru Bleotu
88acdc06b7 Added esxdatacenter.datacenter_configured state 2017-07-20 16:43:44 +01:00
Alexandru Bleotu
ee603c0b4c Updated vsphere.get_proxy_type to work if the proxy settings are set via the config file 2017-07-20 11:53:58 +01:00
Erik Johnson
2fb986f5ca Merge pull request #42367 from rallytime/files-util 
Move file-related utilities out of init file and into salt.utils.files.py
 2017-07-19 16:55:52 -05:00
rallytime
acc55a6e70 Remove Oxygen refs for funcs that have been here since 2016.11 at least 2017-07-19 12:24:20 -06:00
rallytime
9014ef3105 Fix some Nitrogen references still present in develop 2017-07-19 11:16:32 -06:00
Mike Place
e669f5710e Merge pull request #42376 from whiteinge/execution-module-serializers 
Add execution module wrappers for calling serializer modules
 2017-07-19 11:43:01 -05:00
Mike Place
42b314abf8 Merge pull request #42372 from rallytime/mkstemp-utils 
Move mkstemp util function to salt.utils.files.py
 2017-07-19 11:29:32 -05:00
Mike Place
c9972fe4fb Merge pull request #42383 from AndrewPashkin/revert-37003-gradual-pillar-loading 
Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"
 2017-07-19 11:28:22 -05:00
Nicole Thomas
745d2ff3c4 Merge pull request #42230 from vberthet/vberthet-xen-ignore-ssl 
[Salt-cloud] Allow to ignore ssl with Xen provider
 2017-07-19 09:57:56 -06:00
Mike Place
7419e82cb2 Merge pull request #42362 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-19 10:56:15 -05:00
Nicole Thomas
0f2ef2f85c Merge pull request #42346 from edgan/patch-2 
Document use of python methods in jinja
 2017-07-19 09:53:25 -06:00
Berthet
476b10714b Merge branch 'develop' into vberthet-xen-ignore-ssl 2017-07-19 15:48:37 +02:00
Andrew Pashkin
b0148c15c7 Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file" 2017-07-19 12:25:22 +03:00
Seth House
0134a95e1d Add execution module wrappers for calling serializer modules 2017-07-18 18:25:45 -06:00
rallytime
0ab4787d81 Fix all salt.utils fopen references in test_file 2017-07-18 17:10:11 -06:00
rallytime
55087de5e0 Move mkstemp util function to salt.utils.files.py 
The references for this function have already been updated throughout
Salt's code. This move the function from `salt/utils/__init__.py` to
`salt.utils.files.py` and puts the function in the init file on a
deprecation path.
 2017-07-18 15:28:07 -06:00
rallytime
3f0945b9b7 Fix one more salt.utils fopen reference to point to files 2017-07-18 15:04:49 -06:00
rallytime
89d957b124 Update unit test mocks for salt.utils.files.fopen 2017-07-18 13:40:07 -06:00
Nicole Thomas
3e39526009 Merge pull request #42358 from Ch3LL/doc-update-develop 
[develop] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:46 -06:00
rallytime
0f5dd79aa0 Lint fixes 2017-07-18 12:46:15 -06:00
Nicole Thomas
e8bf50696c Merge branch 'develop' into vberthet-xen-ignore-ssl 2017-07-18 12:41:55 -06:00
Nathan Grennan
4985e68f61 Update index.rst 2017-07-18 10:38:17 -07:00
rallytime
25795495c1 Make sure we import salt.utils.files late in salt.utils in _all_ functions 2017-07-18 11:25:55 -06:00
Mike Place
1b683f2fca Merge pull request #37003 from AndrewPashkin/gradual-pillar-loading 
Make possible to reference previous pillars from subsequent pillars, as they specified in the top file
 2017-07-18 12:13:56 -05:00
rallytime
c00b574d2b Add removed functions back in to utils/__init__.py for warn_until uses 
We can't just remove these funcitons without proper warnings to users,
so I have added the functions back into utils/__init__.py so we can
properly warn users about the functions moving.
 2017-07-18 11:06:06 -06:00
rallytime
df693423b9 Move salt.utils.rm_rf to salt.utils.files.rm_rf 
Also added a deprecation warning to utils/__init__.py and updated
all references to rm_rf in salt codebase.
 2017-07-18 10:48:54 -06:00
rallytime
ccf790a83f Update all references for moved functions to use "files" util 
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
 2017-07-18 10:31:01 -06:00
rallytime
f59ecb7ffe Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/executors/sudo.py
 2017-07-18 08:57:55 -06:00
Ch3LL
0f48ee8a35 [develop] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:58:03 -04:00
Nathan Grennan
0bfc1a2fb2 Document use of python methods in jinja 2017-07-17 12:24:41 -07:00
Mike Place
8dbb93851d Merge pull request #42087 from redmatter/fix-dockerng-volume-present-result-2017.7 
Make result=true if Docker volume already exists
 2017-07-17 13:41:47 -05:00
Mike Place
c84d6db548 Merge pull request #42186 from rallytime/fix-42166 
Use long_range function for IPv6Network hosts() function
 2017-07-17 13:39:35 -05:00
Mike Place
0d11e1f9a2 Merge pull request #42207 from jlayze/patch-6 
Add delay option to beacons/service.py
 2017-07-17 13:27:44 -05:00
Mike Place
7ff39c1938 Merge pull request #42203 from amontalban/augeas_doc_fix 
Fix Augeas state documentation example
 2017-07-17 13:26:39 -05:00
Mike Place
e7b79e0fd2 Merge pull request #42210 from terminalmage/issue40928-2017.7 
Only pass a saltenv in orchestration if one was explicitly passed (2017.7)
 2017-07-17 13:22:38 -05:00
Mike Place
0e49021b0e Merge pull request #42236 from cloudflare/napalm-provider 
New option for napalm proxy/minion: provider
 2017-07-17 13:19:55 -05:00
Mike Place
87361ca128 Merge pull request #42244 from alexbleotu/jinja_globals_gh 
Jinja raise function and globals decorator
 2017-07-17 13:16:36 -05:00
Mike Place
da6e9976e8 Merge pull request #42245 from alexbleotu/decorator_fixes-gh 
Minor vsphere fixes
 2017-07-17 12:57:57 -05:00
Mike Place
3ec5bb1c2f Merge pull request #42257 from twangboy/win_unit_pillar_test_git 
Fix `unit.pillar.test_git` for Windows
 2017-07-17 12:51:41 -05:00
Mike Place
36395625c2 Merge pull request #42258 from twangboy/win_unit_states_tests_environ 
Fix `unit.states.test_environ` for Windows
 2017-07-17 12:50:37 -05:00
rallytime
fe972f59e7 Move files-related functions from utils/__init__.py to utils/files.py 2017-07-17 11:48:58 -06:00
Mike Place
894bdd2b19 Merge pull request #42265 from rallytime/gate-moto-version 
Gate boto_elb tests if proper version of moto isn't installed
 2017-07-17 12:47:51 -05:00
Mike Place
baf04f2a2d Merge pull request #42277 from twangboy/win_unit_states_test_winrepo 
Fix `unit.states.test_winrepo` for Windows
 2017-07-17 12:37:06 -05:00
Mike Place
a6f540327c Merge pull request #42287 from cloudflare/runner-get-opts 
test.get_opts runner function, similar to the exec fun
 2017-07-17 12:35:28 -05:00
Mike Place
699025b36e Merge pull request #42296 from not-raspberry/patch-1 
Document how to specify view permissions
 2017-07-17 12:34:37 -05:00