valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,422 Commits 24 Branches 182 Tags 341 MiB
cd72b12161
Commit Graph

60422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
514f6349d4 Bugfix: crash on "key not found" error 2016-01-22 18:39:30 +01:00
Bo Maryniuk
ea75f55a1a Fix PEP8: line continuation 2016-01-22 18:38:40 +01:00
Bo Maryniuk
ece35ebc26 Replace old fashion string memcopy with the list 2016-01-22 18:38:15 +01:00
Bo Maryniuk
716445e588 Fix PEP8: line continuation 2016-01-22 18:37:31 +01:00
Bo Maryniuk
0f11079ff9 Fix PEP8 for the operator 2016-01-22 18:37:12 +01:00
Mike Place
05d05263ab Merge pull request #30532 from whiteinge/slsutil-mod 
Add execution module for working in sls files
 2016-01-22 10:25:16 -07:00
Mike Place
1da1bb9afc Merge pull request #30529 from terminalmage/2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-01-22 10:19:39 -07:00
Erik Johnson
e85ad690fb Lint fixes 2016-01-22 10:58:34 -06:00
Seth House
a57d9984e4 Add slsutil to doc index 2016-01-22 09:45:45 -07:00
Seth House
155966c9d2 Add execution module for working in sls files 2016-01-22 09:45:45 -07:00
Mike Place
1aafd4c5b5 Merge pull request #30530 from terminalmage/yumpkg-dnf-cleanup 
2015.5 tweaks from #30529
 2016-01-22 09:26:21 -07:00
Erik Johnson
2586f71bcf 2015.5 tweaks from #30529 
In the process of resolving merge conflicts in the merge-forward of
2015.5 to 2015.8 which I did in #30529, I found two changes that should
have been made in the 2015.5 branch. One was the removal of yum-specific
information in the pkg.remove docstring, and the other was needless use
of -q when deleting a version lock in pkg.unhold. We're not parsing the
output and the default loglevel is debug, so using -q here removes
helpful troubleshooting output from the log.
 2016-01-22 02:01:33 -06:00
Erik Johnson
43829ecee6 Docstring tweaks 
This commit adds 2015.8-specific context to the top-level docstring and
also removes yum-specific terminology from the pkg.remove function.
 2016-01-22 01:53:03 -06:00
Erik Johnson
92d5a2a49c Fix spelling 2016-01-22 01:31:45 -06:00
Erik Johnson
fdc60fc04a Modify pkg.group_installed to reflect changes in yumpkg.py 2016-01-22 01:21:59 -06:00
Erik Johnson
a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 2016-01-22 01:20:27 -06:00
Mike Place
e366f6a7fd Merge pull request #30526 from twangboy/reg_flushkey 
Added FlushKey to make sure it's changes are saved to disk
 2016-01-21 19:33:13 -07:00
twangboy
23085ffbbb Added FlushKey to make sure it's changes are saved to disk 2016-01-21 18:21:55 -07:00
Mike Place
cdc731b8c5 Merge pull request #30521 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-21 16:05:03 -07:00
Mike Place
019af349af Merge pull request #30485 from jtand/pip_8_update_2015.8 
Updated pip_state to work with pip 8.0 on 2015.8
 2016-01-21 15:55:38 -07:00
Mike Place
3259fde362 Merge pull request #30494 from isbm/isbm-zypper-nfoinst-bool-fix 
Zypper: info_installed — 'errors' flag change to type 'boolean'
 2016-01-21 15:55:05 -07:00
Mike Place
596892326d Merge pull request #30506 from jacksontj/2015.8 
Properly remove newlines after reading the file
 2016-01-21 15:53:57 -07:00
Mike Place
15c7aedd46 Merge pull request #30508 from rallytime/linode-clone-fixes 
Fix Linode driver cloning functionality
 2016-01-21 15:53:36 -07:00
Mike Place
79528c59c3 Merge pull request #30522 from terminalmage/fix-worktree-tests 
Update git.list_worktree tests to reflect new return data
 2016-01-21 15:34:20 -07:00
Colton Myers
f22f5ff851 Fix lint 2016-01-21 15:33:15 -07:00
Colton Myers
7798d42272 Merge pull request #30484 from terminalmage/dnf-yumpkg-2015.5 
Backport DNF support to 2015.5 branch
 2016-01-21 15:14:46 -07:00
Erik Johnson
ea0ca70187 Add git.list_worktrees unit test 2016-01-21 15:42:30 -06:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Colton Myers
b348f804b1 Merge pull request #30512 from jfindlay/repo_test 
disable pkgrepo test for ubuntu 15.10+
 2016-01-21 14:32:58 -07:00
Erik Johnson
393015edbb Remove git.list_worktrees tests 
These are being added back as unit tests.
 2016-01-21 15:13:02 -06:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
rallytime
d26ed74bde Make sure the correct profile parameters are being checked when cloning 2016-01-21 10:29:48 -07:00
Bo Maryniuk
4d7659270e Place the boolean check 2016-01-21 17:55:18 +01:00
Bo Maryniuk
58db1c3b16 Fix typo 2016-01-21 17:50:14 +01:00
Thomas Jackson
e1dea6f843 Properly remove newlines after reading the file 
This means if there are additional newline characters in the config (which have no meaning for ifcfg) then we won't see it as a diff
 2016-01-21 08:16:28 -08:00
Mike Place
a9348dfef8 Merge pull request #30478 from jtand/pip_8_update 
Updated pip_state to work with pip 8.0
 2016-01-21 09:02:41 -07:00
Erik Johnson
330e26d1da Hide get_locked_packages 2016-01-21 09:56:13 -06:00
Erik Johnson
5a637420e8 Backport DNF support to 2015.5 branch 
This will allow 2015.5 releases to operate successfully on Fedora 22 and
newer.
 2016-01-21 09:56:13 -06:00
Mike Place
119f025073 Merge pull request #30483 from borgstrom/pyobjects_recursive-2015.8 
Pyobjects recursive import support (for 2015.8)
 2016-01-21 08:55:27 -07:00
Mike Place
a30147c64f Merge pull request #30482 from borgstrom/pyobjects_recursive 
Pyobjects recursive import support (for 2015.5)
 2016-01-21 08:54:32 -07:00
Mike Place
d8d19cf75d Merge pull request #30491 from jacksontj/2015.8 
Add multi-IP support to network state
 2016-01-21 08:51:42 -07:00
Mike Place
56332ca504 Merge pull request #30496 from alprs/fix-ignored_pillars_keyerror 
Fix KeyError when adding ignored pillars
 2016-01-21 08:51:03 -07:00
Andreas Lutro
bbcb783621 fix KeyError when adding ignored pillars 2016-01-21 09:11:04 +01:00
Bo Maryniuk
43254aa993 Update docstring according to the boolean flag 2016-01-21 08:49:16 +01:00
Bo Maryniuk
a7d3e0d5ad Change 'errors' flag to boolean. 2016-01-21 08:48:08 +01:00
Thomas Jackson
82213555ca Normalize yaml spacing to 2 space 2016-01-20 18:29:03 -08:00
Thomas Jackson
3d1469b8d9 Add example of multiple addrs/ipv6addrs to docs 2016-01-20 18:29:03 -08:00
Thomas Jackson
91c8a1b4e4 Add support for multiple IP addresses per interface to rh_ip 2016-01-20 18:29:03 -08:00
rallytime
1d7e229377 Fix Linode driver cloning functionality. 
Fixes #30432
Fixes #30444

- Various clean-up of the driver, particularly in the create function.
- Restores cloning functionality, as this was completely broken in 2015.8.3
- Changes the requirement to set a config_id for cloned VMs (not necessary
for clones as the config_id is already set via the to-be-cloned profile)
- Updates docs to use the -F bootstrap script arg in addition to -C when
cloning from a VM that already has salt installed on it.
 2016-01-20 17:05:20 -07:00
Evan Borgstrom
2c55a7580b Fixup lint errors 2016-01-20 15:29:30 -08:00