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
85,855 Commits 24 Branches 182 Tags 341 MiB
054f7c9551
Commit Graph

85855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
054f7c9551 Merge pull request #43559 from sdodsley/purefa_doc_fix 
Fix documentation to state correct module name [purefa]
 2017-09-18 16:56:25 -04:00
Simon Dodsley
35d18cd05a Fix documentation to state correct module name 2017-09-18 13:46:21 -07:00
Nicole Thomas
f32e838726 Merge pull request #43573 from theredcat/develop 
Add an option to check & update elasticsearch template
 2017-09-18 16:31:21 -04:00
garethgreenaway
431484f9c8 Merge pull request #43339 from cloudflare/napalm-beacon 
Adding the first napalm beacon
 2017-09-18 10:31:46 -07:00
Nathan DELHAYE
deff257fe7 Lint 2017-09-18 17:08:05 +02:00
Nathan DELHAYE
cdcbcdf989 Add an option to check & update elasticsearch template 2017-09-18 16:10:59 +02:00
Mircea Ulinic
40f36c9915 Merge branch 'develop' of github.com:saltstack/salt into napalm-beacon 2017-09-18 10:30:49 +00:00
Mircea Ulinic
74d1a56524 Add validate function 
Also, correct some docstings and improve logged messages
 2017-09-18 10:28:42 +00:00
Pedro Algarvio
826a25a287 Merge pull request #43515 from garethgreenaway/develop_home_dir_missing_from_syspaths 
[develop] Fixes to setup.py
 2017-09-17 19:36:57 +01:00
garethgreenaway
51daf19aaf Merge branch 'develop' into develop_home_dir_missing_from_syspaths 2017-09-16 17:40:25 -07:00
Nicole Thomas
c1ca1c4816 Merge pull request #43494 from rallytime/move-new-utils-funcs 
Move new utils functions out of salt.utils and into separate files
 2017-09-15 17:29:49 -04:00
Nicole Thomas
9a66d5cebc Merge pull request #43495 from rallytime/move_arg_utils 
Move 2 arg-related utility functions into salt.utils.args.py
 2017-09-15 17:29:10 -04:00
Nicole Thomas
a454065c74 Merge pull request #43501 from The-Loeki/high-out-cleanup 
highstate output minor cleanup and code duplication removal
 2017-09-15 15:38:09 -04:00
Mike Place
a1b871304b Merge pull request #43345 from ribx/develop 
better atom extraction from portage version string
 2017-09-15 12:29:25 -06:00
Mike Place
b262695301 Merge pull request #43493 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-15 12:23:09 -06:00
Gareth J. Greenaway
2cdd775ca8 Adding back in the salt-spm-reactor-dir 2017-09-15 08:40:38 -07:00
Gareth J. Greenaway
fadcc61618 Adding home_dir to SaltDistribution.global_options. 2017-09-14 18:34:32 -07:00
Gareth J. Greenaway
c70df4adcd Following the change in #42103 if Salt is installed via setup.py then the generated _syspaths.py does not contain the HOME_DIR which results in a failure. 2017-09-14 16:18:45 -07:00
Erik Johnson
792cc0eb54 Merge pull request #43203 from rallytime/fix-21969 
Return a SaltInvocationError when passing incorrect function pattern for wheel/runner functions.
 2017-09-14 12:17:48 -05:00
rallytime
75abf0a2a9 Test fix: update mock util path 2017-09-14 11:01:06 -04:00
Nicole Thomas
ebbc3c11d0 Merge pull request #43483 from 3add3287/modules-ssh-add-newline-fix 
Handle bogus newline before newly added keys
 2017-09-14 10:19:51 -04:00
rallytime
dcd3dcc734 Lint: Add missing import to utils.args.py 2017-09-14 10:15:20 -04:00
Nicole Thomas
aee52a20e0 Lint: Add empty line at end of file 2017-09-14 09:48:09 -04:00
Ronald van Zantvoort
efb23cd717 highstate output pylint fix 2017-09-14 15:32:32 +02:00
Nicole Thomas
32a5221f70 Merge pull request #43498 from vernondcole/fix_preflight 
preflight_cmds should use passed opts
 2017-09-14 09:20:56 -04:00
Robin Lutz
e1428dec5f corrected some PEP8 problems reported by jenkins 2017-09-14 14:24:54 +02:00
Ronald van Zantvoort
888c853fc4 highstate output minor cleanup and code duplication removal 2017-09-14 13:40:39 +02:00
garethgreenaway
e04018ff3c Merge branch 'develop' into move-new-utils-funcs 2017-09-13 19:26:08 -07:00
vernoncole
05fe5bed7c preflight_cmds should use passed opts 2017-09-13 20:10:49 -06:00
Nicole Thomas
7addeb4b9c Lint: fix spacing 2017-09-13 18:35:49 -04:00
Nicole Thomas
36bc4ac912 Merge pull request #43462 from rdutch/beacon_state_fix 
Added save argument to Beacon state module
 2017-09-13 18:33:32 -04:00
rallytime
acb98bbce2 Move salt.utils.argspec_report to salt.utils.args.py 2017-09-13 18:12:52 -04:00
rallytime
9df868930a Move salt.utils.arg_lookup to salt.utils.args.py 2017-09-13 17:37:49 -04:00
rallytime
82feaea913 Move salt.utils.xor to salt.utils.value 2017-09-13 16:49:16 -04:00
rallytime
6e7149cd71 Move salt.utils.human_to_bytes to salt.utils.stringutils 2017-09-13 16:30:52 -04:00
Nicole Thomas
f8ef7dce40 Merge pull request #43469 from alexbleotu/test_fixes-gh 
Fixed several tests
 2017-09-13 15:53:53 -04:00
Nicole Thomas
395f079daf Merge branch 'develop' into modules-ssh-add-newline-fix 2017-09-13 15:51:48 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
rdutch
fd0b1ca9f9 Merge branch 'develop' into beacon_state_fix 2017-09-13 13:48:20 -05:00
Hilberding, Rob
810899d413 Simplified if statement 2017-09-13 13:44:05 -05:00
3add3287
999deacb0a Fix indentation from tabs to spaces 2017-09-13 20:38:39 +02:00
Nicole Thomas
c3d9e2d9b2 Merge pull request #43431 from mattLLVW/fix-hosts-deb 
Fix /etc/hosts not being modified when hostname is changed
 2017-09-13 14:35:54 -04:00
Nicole Thomas
75e8c181ec Merge pull request #43485 from rallytime/linode-utils 
Move "salt.utils" calls to __utils__ in linode driver
 2017-09-13 14:31:21 -04:00
Hilberding, Rob
b71e7e673f Made the requested changes 2017-09-13 13:19:12 -05:00
Nicole Thomas
d2b13ce4c0 Merge pull request #43468 from terminalmage/git-configparser 
Fix unicode handling on PR #43378
 2017-09-13 13:57:17 -04:00
Alexandru Bleotu
bf3785739e Fixed failing config.test_api tests for when the ROOT_DIR is / 2017-09-13 13:01:15 -04:00
Mike Place
4fc64fd5b9 Merge pull request #43465 from psagers/develop 
acme.cert: avoid IOError on failure.
 2017-09-13 10:52:15 -06:00
Mike Place
cebe28e217 Merge pull request #43466 from cachedout/cisc_oxygen_release_notes 
Add information about cimc to release notes
 2017-09-13 10:46:41 -06:00
Mike Place
9767e46ce4 Merge branch 'develop' into cisc_oxygen_release_notes 2017-09-13 10:45:24 -06:00
Mike Place
d2b790d883 Merge pull request #43471 from alexbleotu/esxcluster-gh 
Esxcluster proxy minion and support in vsphere module
 2017-09-13 10:11:22 -06:00