valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,070 Commits 24 Branches 182 Tags 341 MiB
8a7134e72d
Commit Graph

37070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
8a7134e72d Merge pull request #18672 from whiteinge/mod_aggregate-state-level 
Add docs for mod_aggregate state-level keywords
 2014-12-03 21:12:10 -07:00
Thomas S Hatch
64bab7c7fd Merge pull request #18666 from garethgreenaway/18550_2014_7_swap_device_symlink 
Fixed to mount state related to enabling swap
 2014-12-03 21:08:11 -07:00
Thomas S Hatch
f17b456e7d Merge pull request #18663 from terminalmage/buildpackage-jenkins-adjustment 
Always run download_packages() after executing buildpackage SLS
 2014-12-03 21:06:54 -07:00
Thomas S Hatch
85c6395eca Merge pull request #18660 from garethgreenaway/18613_2014_7_mount_via_uuid 
Fixes to mount state.
 2014-12-03 21:04:53 -07:00
Thomas S Hatch
09e914813c Merge pull request #18657 from wuxxin/2014.7 
2014.7: fix for #18632
 2014-12-03 21:03:41 -07:00
Thomas S Hatch
b798f33c78 Merge pull request #18655 from eliasp/2014.7-modules.locale-gentoo_fixes 
2014.7 modules.locale gentoo fixes
 2014-12-03 21:02:02 -07:00
Thomas S Hatch
23259e5ecd Merge pull request #18654 from thatch45/func_fail 
Add retcode and success to function not found
 2014-12-03 20:57:41 -07:00
Thomas S Hatch
0bed869f1f Merge pull request #18644 from rallytime/boto_asg_fix 
If the asg does not exist in the region provided, don't return True.
 2014-12-03 20:55:11 -07:00
Thomas S Hatch
68a8909786 Merge pull request #18682 from eliasp/2014.7-modules.file.replace-issue-18680 
Don't empty the file when it is supposed to be only read.
 2014-12-03 20:53:32 -07:00
Elias Probst
873639965b Don't empty the file when it is supposed to be only read. 
Iterating over an fileinput.input() object with inplace=True
and not returning any results per iteration leaves an empty
input file.
 2014-12-03 19:28:29 +01:00
Thomas S Hatch
c17335beec Merge pull request #18634 from jacksontj/2014.7 
Add JID to scheduled jobs names as well
 2014-12-03 10:26:59 -07:00
Thomas S Hatch
ec5d3804bb Merge pull request #18629 from terminalmage/issue18571 
Remove quotes from s3fs ETag entries
 2014-12-03 10:24:56 -07:00
Thomas S Hatch
cee5d5b68c Merge pull request #18601 from krak3n/2014.7 
Docker pulled - compare against images correctly
 2014-12-03 10:06:35 -07:00
Thomas S Hatch
b1b770014b Merge pull request #18592 from nazgul5/utils.network 
salt.utils.network._interfaces_ifconfig: SunOS fix
 2014-12-03 10:02:15 -07:00
Gareth J. Greenaway
59e0ad70cd Fixing a bug if a swap device is specified as one of the special symlinks, eg. the links under /dev/disk/by-uuid 2014-12-02 18:12:39 -08:00
Pedro Algarvio
60b9d47be5 Merge pull request #18638 from s0undt3ch/2014.7 
Some 2014.7 test fixes
 2014-12-03 00:54:43 +00:00
Erik Johnson
5c864fa003 Always run download_packages() after executing buildpackage SLS 
By restricting this function call to when the script is successful, we
end up losing the log file from buildpackage.py when it fails, making it next to
impossible to troubleshoot. This commit makes jenkins retrieve at least
the log file, no matter what happens.
 2014-12-02 17:49:50 -06:00
Seth House
54d8760d2d Added docs for the state-level aggregate keyword 
Also added clarification on the two ways to invoke the aggregation
function.
 2014-12-02 18:33:10 -05:00
Seth House
aa964e5d3c Added state_aggregate placeholders to the master/minion conf files 2014-12-02 18:33:10 -05:00
Pedro Algarvio
a964a2161e Switch imports and revert the assert to what it was. 2014-12-02 23:18:54 +00:00
Gareth J. Greenaway
ea3bc1c6e1 Fixing a bug when mounting using the UUID but the device is mounted using the actual device. Results in an attempt to umount and remount. 2014-12-02 15:02:25 -08:00
Colton Myers
712a9f4a7d Merge pull request #18651 from basepi/issue-16413 
Add fix from #16413
 2014-12-02 16:00:14 -07:00
Felix Erkinger
164bea7656 Merge branch '2014.7' of https://github.com/saltstack/salt into 2014.7 2014-12-02 22:47:27 +01:00
Felix Erkinger
f73257af38 make a functional equivalent patch to fix #18632 2014-12-02 22:46:12 +01:00
Elias Probst
ea65712986
Improve locale._normalize_locale() by dropping the charmap. 2014-12-02 22:25:03 +01:00
Thomas S Hatch
b156cddde0 Add retcode and success to function not found 
Fix #18512
 2014-12-02 14:22:57 -07:00
Elias Probst
efeed3ed47 Improve/fix locale.gen_locale() on Debian and Gentoo. 
- Validate the locale first instead of trying to generate it blindly
- Gentoo (just as Debian already did) requires the locale to be listed
  in /etc/locale.gen before being able to generate it
- 'locale-gen' needs the '--generate' param on Gentoo
- Quote the locale supplied to 'locale-gen' as it might contain a
  whitespace
 2014-12-02 22:21:45 +01:00
Colton Myers
5846524fe8 Add fix from #16413 2014-12-02 14:04:10 -07:00
rallytime
c64a542bb4 Also add some logic and debug logs to launch_configuration_exists 
Fixes #18566
 2014-12-02 11:59:06 -07:00
Thomas S Hatch
19022ff90f Merge pull request #18620 from cro/pg_jid_doc8 
jids can't be ints anymore, because we can now set jid names.
 2014-12-02 10:04:38 -07:00
Thomas S Hatch
dbcc98e5ba Merge pull request #18610 from rallytime/update_zmq4_docs 
Make ZMQ 4 installation docs for ubuntu more clear
 2014-12-02 10:04:16 -07:00
rallytime
883cf36016 If the asg does not exist in the region provided, don't return True. 
Refs #18566
 2014-12-02 09:15:10 -07:00
Pedro Algarvio
04fe9382aa Merge pull request #18585 from rallytime/cmd_unittests 
Added some more cmdmod unittests
 2014-12-02 15:54:57 +00:00
Pedro Algarvio
8773dd391b Merge pull request #18608 from jfindlay/user_typos 
fix typos in states.user.present #18590
 2014-12-02 15:53:55 +00:00
Pedro Algarvio
6a259dc229 Proper minion config initialization. Fix test. 2014-12-02 07:55:52 +00:00
Pedro Algarvio
c6eab06e70 Add required imports 2014-12-02 07:44:16 +00:00
Pedro Algarvio
f720fc1f78 Proper minion config initialization 2014-12-02 07:43:18 +00:00
Pedro Algarvio
0dd818053e Proper minion config setup 2014-12-02 07:34:45 +00:00
Thomas Jackson
d977eb2a2d Add JID to scheduled jobs names as well 2014-12-01 18:45:52 -08:00
Felix Erkinger
331078bfd0 fixes #18632 (os.path.expanduser does not expand quoted paths) 2014-12-02 02:40:05 +01:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7 
Since it's unlikely we upgrade PyLint in this branch
 2014-12-02 01:37:42 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
74110d845f Don't assume the PATH env var is set 2014-12-02 01:25:31 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Erik Johnson
daf7f94907 Remove quotes from s3fs ETag entries 
This causes md5 comparisons to fail and makes the master think it needs
to re-download every file.
 2014-12-01 17:14:01 -06:00
Mike Place
3ea390f4b5 Merge pull request #18617 from rallytime/disable_max_files_test 
Skip test_max_open_files test until we can find the real problem
 2014-12-01 14:45:03 -07:00
C. R. Oldham
fa2d69821d jids can't be ints anymore, because we can now set jid names. 2014-12-01 14:15:06 -07:00
Joseph Hall
a5a92db7e6 Merge pull request #18618 from juiceinc/2014.7 
Fixed allocate_new_eip typo in AWS cloud docs
 2014-12-01 13:53:35 -07:00
Tim O'Guin
39fb372898 fixed allocate_new_eip typo in AWS cloud docs 2014-12-01 14:46:32 -06:00
rallytime
3760915099 Skip test_max_open_files test until we can find the real problem 2014-12-01 13:43:57 -07:00