Commit Graph

38715 Commits

Author SHA1 Message Date
Christophe Drevet-Droguet
c4954046ad unit tests for grains.append module function
- separate test functions for every return
- add tests for nested lists
- add test for appending to an element of a list (fails silently)
2015-05-10 17:27:32 +02:00
Christophe Drevet-Droguet
0c9a32326c use MagickMock 2015-05-09 18:34:02 +02:00
Christophe Drevet-Droguet
c838a22377 unit tests for grains.append module function 2015-05-08 21:01:36 +02:00
Christophe Drevet-Droguet
a01a5bb51e grains.get, parameter delimititer, versionadded: 2014.7.6 2015-05-08 16:52:06 +02:00
Christophe Drevet-Droguet
b39f50475d remove debugging output 2015-05-07 15:35:22 +02:00
Christophe Drevet-Droguet
b6e15e295c fix grains.append in nested dictionnary grains #23411 2015-05-07 08:49:05 +02:00
Justin Findlay
1fb606ef6b Merge pull request #22754 from twangboy/fix_bat_again
Removed redundant \ and "
2015-04-16 13:50:00 -06:00
twangboy
223c46a38e Removed redundent \ and " 2015-04-16 18:40:23 +00:00
Nicole Thomas
75348e5113 Merge pull request #22748 from twangboy/fix_bat
Changed %cd% to %~dp0
2015-04-16 10:27:31 -06:00
salt_build
2d3d0b1c15 Changed %cd% to %~dp0 2015-04-16 15:07:28 +00:00
Thomas S Hatch
787ec88373 Merge pull request #22716 from twangboy/list_pkg_fix
Removed list_pkgs caching
2015-04-15 22:51:02 -06:00
Shane Lee
e1ee7db991 Update win_pkg.py
Fixed some lint
2015-04-15 22:10:02 -06:00
salt_build
2ce35d2621 Removed list_pkgs caching 2015-04-15 19:47:30 +00:00
Justin Findlay
3a5a60b5a7 Merge pull request #22688 from msteed/issue-22676
Add missing command line options to man pages
2015-04-14 23:17:47 -06:00
Thomas S Hatch
fb31ab4dd5 Merge pull request #22693 from dmyerscough/fix-keyerror-in-salt-cloud
Fixing key error
2015-04-14 22:06:45 -06:00
Damian Myerscough
f35c3bd8b6 Fixing key error 2015-04-14 19:53:16 -07:00
Michael Steed
70f1ca9ea5 Add missing command line options to man pages
Refs #22676
2015-04-14 17:32:56 -06:00
Nicole Thomas
23a9d77fd2 Merge pull request #22674 from jacobhammons/2014.7
Regenerated salt-call and salt.7 man pages
2015-04-14 15:42:44 -06:00
Jacob Hammons
6e416fc300 Regenerated salt-call and salt.7 man pages Refs #22239 2015-04-14 13:56:31 -06:00
Nicole Thomas
c0d1bdd60b Merge pull request #22666 from msteed/issue_22239
Update salt-call manpage to match cli help text
2015-04-14 13:24:03 -06:00
Nicole Thomas
edeec678d4 Merge pull request #22623 from thatch45/merge_22115
merge 22115 in correct branch
2015-04-14 12:47:20 -06:00
Michael Steed
5efb284c22 Update salt-call manpage to match cli help text
refs #22239
2015-04-14 11:52:55 -06:00
Justin Findlay
795c01d362 Merge pull request #22656 from jfindlay/bp-22624
backport #22624 to 2014.7
2015-04-14 10:50:33 -06:00
Justin Findlay
9a2aca4671 Merge pull request #22643 from TimJones/fix-pkgrepo-ppa-missing-add-apt-repository
Fix aptpkg.mod_repo returning OK even if apt-add-repository fails.
2015-04-14 09:30:25 -06:00
Artur Kaszuba
e4d8478eae Remove blank line 2015-04-14 09:01:44 -06:00
Artur Kaszuba
0a5c345889 Fix for high cpu usage by salt-ssh 2015-04-14 08:48:13 -06:00
Justin Findlay
a219be7c07 Merge pull request #22625 from rallytime/bp-22565
Backport #22565 to 2014.7
2015-04-14 08:13:26 -06:00
Tim Jones
5099621512 Fix aptpkg.mod_repo returning OK even if apt-add-repository fails.
Fixes #22638. aptpkg.mod_repo raises an error if apt-add-repository
returns with a non-zero exit code.
2015-04-14 12:48:53 +02:00
Artur Kaszuba
ecc14deff8 Increase frequency of ssh terminal output checking 2015-04-13 16:03:35 -06:00
Thomas S Hatch
05a9f47356 merge 22115 in correct branch 2015-04-13 15:50:37 -06:00
Thomas S Hatch
670c07b6fd Merge pull request #22621 from rallytime/release_note_change
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:32:15 -06:00
rallytime
fb03af37d3 Add note about missing state internal keyword arguments to release notes 2015-04-13 15:29:55 -06:00
Thomas S Hatch
e24ffa05d9 Merge pull request #22610 from rallytime/batch-bug_note
Add batch matching bug note to known issues in 2014.7.4 release notes
2015-04-13 15:25:12 -06:00
Thomas S Hatch
953a625e9e Merge pull request #22608 from garethgreenaway/19003_2014_7_mount_fixes
remount related fixes in 2014.7
2015-04-13 15:25:04 -06:00
Thomas S Hatch
fe7ad0ef25 Merge pull request #22476 from tjstansell/fix-21998
fix #21998 - use yum reposdir as basedir defaults
2015-04-13 14:53:39 -06:00
Thomas S Hatch
289f6cbd04 Merge pull request #22597 from hvnsweeting/fix-sls-requisite-not-found
fix #12480
2015-04-13 14:39:52 -06:00
Thomas S Hatch
bd83b6c0b5 Merge pull request #22553 from alprs/fix-git_latest_empty
Make git.latest work with empty source repositories
2015-04-13 14:12:04 -06:00
rallytime
9eb273f097 Add batch matching bug note to known issues in 2014.7.4 release notes 2015-04-13 13:35:48 -06:00
Gareth J. Greenaway
2278930c94 Adding cvfs and any fuse based filesystem to the list of filesystems that should not be remounted, rather unmounted and mounted again. 2015-04-13 12:10:56 -07:00
Viet Hung Nguyen
d03970f41c fix #12480
When req_val = 'redis', req_key = 'sls', if chunk['__id__'] is 'redis',
but chunk['state'] is not 'sls',
then code would never run into ``elif`` clause.
2015-04-13 22:57:10 +07:00
Justin Findlay
994f398f12 Merge pull request #22576 from batulin-s/fix-checking-available-package-portage
fixed #22329 bug
2015-04-13 09:09:34 -06:00
Justin Findlay
a269334f01 Merge pull request #22584 from msusta/bp-22362
Fixed malformed locale string in localmod module
2015-04-13 08:20:08 -06:00
Matej Susta
625f141571 Fixed malformed locale string in localmod module 2015-04-13 14:36:19 +02:00
sergey.b
7123ea728e fixed checking of available version of package when accept_keywords were changed (#22329 bug) 2015-04-13 14:38:30 +03:00
Andreas Lutro
4f77f8a64c Make git.latest work with empty repositories 2015-04-11 22:10:33 +02:00
Justin Findlay
9b4127608b Merge pull request #22542 from EliRibble/fix-22541
Show errors on failure to render reactors
2015-04-11 03:27:13 -06:00
Justin Findlay
061c730a29 Merge pull request #22535 from rallytime/fix-22534
Add additional examples to grains.list_absent and grains.list_present
2015-04-10 15:56:09 -06:00
Eli Ribble
33b6e36a63 Show errors on failure to render reactors
Because how else would people debug their broken code. Like me?

https://github.com/saltstack/salt/issues/22541
2015-04-10 15:35:10 -06:00
Thomas S Hatch
20fc878f85 Merge pull request #22532 from rallytime/bp-18846
Backport #18846 to 2014.7
2015-04-10 14:25:39 -06:00
Colton Myers
b02d063129 Add **kwargs to service.mod_watch
Gets rid of warnings about `enable` and `__reqs__` not being supported
by the function
2015-04-10 11:32:32 -06:00