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
Evan Borgstrom
788b672e3a Fixup lint errors 2016-01-20 15:28:48 -08:00
justinta89
9cb17332fa Updated pip_state to work with pip 8.0 on 2015.8 2016-01-20 14:43:50 -07:00
Evan Borgstrom
e148ea2d52 Allow recursive salt:// imports 
Fixes #30465
 2016-01-20 11:29:00 -08:00
Evan Borgstrom
6bbac64d3a Add test to prove that recursive imports are currently broken 
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
 2016-01-20 11:22:51 -08:00
Evan Borgstrom
b46df0e4b5 Allow recursive salt:// imports 
Fixes #30465
 2016-01-20 11:20:50 -08:00
justinta89
6227368830 Convert version to int, instead of comparing strings to ints 2016-01-20 12:00:50 -07:00
Mike Place
e425cbd654 Merge pull request #30359 from distil/zmq_filtering_bug_fix 
Removes suspected copy/paste error for zmq_filtering functionailty
 2016-01-20 11:42:42 -07:00
justinta89
20384a4810 Added InstallationError to except block 2016-01-20 11:05:41 -07:00
justinta89
baa274bca9 Updated pip_state to work with pip 8.0 
Pip 8.0.0 added an InstallationError exception. Updated the state to catch that
exception properly.
 2016-01-20 11:03:18 -07:00
Mike Place
13add7d142 Merge pull request #30448 from cournape/fix-osx-scripts-location 
Fix osx scripts location
 2016-01-20 10:59:29 -07:00
Evan Borgstrom
51bfa16173 Add test to prove that recursive imports are currently broken 
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
 2016-01-20 09:57:16 -08:00
Mike Place
2b7d20cee7 Merge pull request #30457 from rallytime/fix-22820 
Remove fsutils references from modules list
 2016-01-20 09:43:50 -07:00
Mike Place
e706b71871 Merge pull request #30453 from rallytime/fix-30442 
Make sure private AND public IPs are listed for Linode driver
 2016-01-20 09:41:51 -07:00
Mike Place
5c7cc51937 Merge pull request #30459 from jfindlay/pkg_tests 
modules.pkg: disable repo int test for ubuntu 15.10
 2016-01-20 09:41:12 -07:00
Mike Place
73f372dc98 Merge pull request #30458 from rallytime/bp-30062 
Back-port #30062 to 2015.8
 2016-01-20 09:40:22 -07:00
Mike Place
c3fb4006b0 Merge pull request #30468 from timcharper/2015.8 
make note of s3 role assumption in upcoming changelog
 2016-01-20 09:28:04 -07:00
Mike Place
c611541916 Merge pull request #30470 from whiteinge/match_dict 
Add example of the match_dict format to accept_dict wheel function
 2016-01-20 09:26:16 -07:00
Tim Harper
721c1c871b make note of s3 role assumption in upcoming changelog 2016-01-19 20:38:21 -07:00
Seth House
5034e13f5d Add example of the match_dict format to accept_dict wheel function 2016-01-19 19:18:31 -07:00
Justin Findlay
fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 2016-01-19 15:27:12 -07:00
Sean Jenkins
9665d9655f Set (pillar_)merge_lists to default for PR#30062 2016-01-19 15:06:50 -07:00
Sean Jenkins
7ea4dbf478 Fix lint for PR30062 2016-01-19 15:06:37 -07:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
rallytime
3288ff104d Remove fsutils references from modules list 
Fixes #22820
 2016-01-19 14:41:02 -07:00
Mike Place
d70e6b312a Merge pull request #30450 from gtmanfred/2015.8 
fix extension loading in novaclient
 2016-01-19 14:16:32 -07:00
Mike Place
0af5e16809 Merge pull request #30212 from abednarik/fix_file_line_permissions 
Fix incorrect file permissions in file.line
 2016-01-19 14:15:48 -07:00
rallytime
a1f882f4fe Make sure private AND public IPs are listed for Linode driver 
Fixes #30442

Also simplifies the return of the get_ips function to be used in
other places.
 2016-01-19 14:02:55 -07:00
Mike Place
3c12b451fe Merge pull request #29947 from jfindlay/remote_decode 
fileclient: decode file list from master
 2016-01-19 13:36:32 -07:00
Mike Place
6e8b1e89a5 Merge pull request #30363 from terminalmage/issue30203 
Use native "list" subcommand to list git worktrees
 2016-01-19 13:35:41 -07:00
Daniel Wallace
4aa6faaf48 fix extension loading in novaclient 
This should fix #28017
 2016-01-19 13:55:39 -06:00
Mike Place
dfb9dec84f Merge pull request #30445 from jtand/boto_vpc_8 
Boto uses False for is_default instead of None
 2016-01-19 11:28:18 -07:00
Mike Place
dd2ceb4c07 Merge pull request #30443 from jtand/boto_vpc_5 
Boto uses False for is_default instead of None
 2016-01-19 11:28:08 -07:00
Mike Place
f9b3f3f038 Merge pull request #30406 from ZipRecruiter/check-cmd-example 
Add an example of how to use file.managed/check_cmd
 2016-01-19 11:23:49 -07:00
Mike Place
05ad3dcc94 Merge pull request #30424 from isbm/isbm-zypper-utf-8-errors 
Check if byte strings are properly encoded in UTF-8
 2016-01-19 10:52:25 -07:00
David Cournapeau
3c27ab5310 BUG: fix osx .pkg script locations to match the .plist files. 2016-01-19 09:37:20 -08:00
Mike Place
62d9dddced Merge pull request #30420 from attiasr/patch-1 
Backport #26853
 2016-01-19 10:33:58 -07:00
justinta89
00943ff1e6 Boto uses False for is_default instead of None 2016-01-19 10:15:35 -07:00
justinta89
2f77152479 Boto uses False for is_default instead of None 2016-01-19 10:12:11 -07:00
David Cournapeau
ed9ab68d3b BUG: fix missing sudo when linking certify cert. 2016-01-19 07:58:11 -08:00
Bo Maryniuk
a0f263f411 Clarify the error message 2016-01-19 13:10:56 +01:00
Bo Maryniuk
12f8e93247 Update documentation accordingly. 2016-01-19 13:02:58 +01:00
Bo Maryniuk
1d384b6abd Add error handling to the RPM broken strings 2016-01-19 13:02:46 +01:00
Bo Maryniuk
cf0dad3a6c Rename keywords arguments variable to a default name. 2016-01-19 13:02:21 +01:00
Bo Maryniuk
26aa801342 Check if byte strings are properly encoded in UTF-8 2016-01-18 16:28:48 +01:00
Rudy Attias
4de343c5a1 Backport #26853 2016-01-18 13:16:09 +02:00
Arthur Axel 'fREW' Schmidt
92e0d77a9a Add an example of how to use file.managed/check_cmd 2016-01-15 15:00:40 -08:00
Mike Place
1bace55e45 Merge pull request #30405 from jtand/glusterfs_py26 
Updated glusterfs.py for python2.6 compatibility.
 2016-01-15 15:50:06 -07:00
Justin Findlay
b9241fb6b0 state: use simple string formatting for messages 2016-01-15 15:50:00 -07:00
Justin Findlay
f6162f168c fileclient: decode file list from master 
Fixes #29918.
 2016-01-15 15:50:00 -07:00
justinta89
a332e06c4a Fixed lint error 2016-01-15 15:37:10 -07:00