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

60607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
de1abae9d1 Merge pull request #31105 from cachedout/lint_30975 
Lint 30975
 2016-02-10 14:11:21 -07:00
Mike Place
446b4c2aff Lint #30975 2016-02-10 14:04:59 -07:00
Mike Place
2e5499748a Merge pull request #31100 from jfindlay/x509_sls 
states.x509: docs: peer.sls -> peer.conf
 2016-02-10 13:47:44 -07:00
Mike Place
f2bede1c00 Merge pull request #31103 from twangboy/fix_reg_state 
Point to reg.delete_key_recursive
 2016-02-10 13:46:53 -07:00
twangboy
fe1ca906d2 Point to reg.delete_key_recursive 2016-02-10 12:34:21 -07:00
Mike Place
94fa76831f Merge pull request #31093 from techhat/spmfix 
Ensure double directories don't get created
 2016-02-10 11:53:47 -07:00
Justin Findlay
6c303b99c2 states.x509: docs: peer.sls -> peer.conf 
Fixes #31069.
 2016-02-10 11:53:35 -07:00
Mike Place
c015ca865c Merge pull request #31095 from jfindlay/link_doc 
modules.file, states.file: explain symbolic links
 2016-02-10 11:53:24 -07:00
Justin Findlay
7d9df6b26c modules.file, states.file: explain symbolic links 
Fixes #31056.
 2016-02-10 11:18:53 -07:00
Mike Place
4d6706b3e7 Merge pull request #31061 from rallytime/revert-breakage 
Revert #30217 - was causing salt-cloud -a breakage
 2016-02-10 11:13:59 -07:00
Mike Place
482eea9883 Merge pull request #31090 from rallytime/bp-30542 
Back-port #30542 to 2015.8
 2016-02-10 11:06:38 -07:00
Joseph Hall
4f4c8877ad Ensure double directories don't get created 2016-02-10 11:04:54 -07:00
Mike Place
5dcaa8d387 Merge pull request #31085 from jacksontj/2015.8 
Correctly remove path we added after loader is completed
 2016-02-10 10:47:21 -07:00
Mike Place
27bf83fa59 Merge pull request #31037 from vutny/correct-doc-install-on-rhel 
Update RHEL installation guide to reflect latest repo changes
 2016-02-10 10:36:04 -07:00
Stephen D. Spencer
67a713f2f6 Some 3rd-party modules (e.g. gnupg) define custom log levels that emit 
at INFO level and above.  This patch sets the color data lookups to
default to TextFormat('reset') rather than producing a stack trace
every time a log message is generated from an affected module.
 2016-02-10 10:15:32 -07:00
Thomas Jackson
dd5051c9e6 Correctly pop the path we added after loader is completed. 
Before this was doing a .pop() which would remove the last thing in sys.path, which is not necessarily the thing we added (in the case that an import modifies sys.path). The original fix was introduced in 4bf1d6838a, this simply ensures that we remove the item we added.
 2016-02-10 08:25:23 -08:00
rallytime
ced2d9f922 Revert #30217 
Reverts commit 1f68ce05bc.
Reverts commit 5264449fdb.

Conflicts:
	salt/runners/cloud.py
 2016-02-10 09:18:57 -07:00
Denys Havrysh
6370ddda9f Update RHEL installation guide 2016-02-10 09:57:17 +02:00
Mike Place
8704750cf9 Merge pull request #31050 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-09 13:13:34 -07:00
Mike Place
f13ffd4608 Merge pull request #31053 from cachedout/boto_test_fix 
Fix boto test failures
 2016-02-09 13:02:16 -07:00
Mike Place
c73b5a4a66 Fix boto_secgroup 2016-02-09 11:52:15 -07:00
Mike Place
25bcc68357 Fix boto test failures 2016-02-09 11:50:26 -07:00
Mike Place
87f2816ef5 Merge pull request #31029 from twangboy/win_defaults 
Windows defaults to multiprocessing true
 2016-02-09 11:20:36 -07:00
Colton Myers
d86e014a39 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    README.rst
    salt/modules/yumpkg.py
 2016-02-09 11:11:36 -07:00
Mike Place
0dcdd0a2a7 Merge pull request #30998 from dmacvicar/dmacvicar-2015.8-27796 
add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (#27796)
 2016-02-09 10:57:36 -07:00
Mike Place
e773fc822a Merge pull request #31049 from twangboy/win_svc_docs 
Fix versionadded in win_service.config
 2016-02-09 10:55:07 -07:00
twangboy
98005255d1 Fix versionadded in win_service.config 2016-02-09 10:52:15 -07:00
Mike Place
c3f115724a Merge pull request #30987 from youngnick/add-back-localhost-peer-handling 
Changed glusterfs.peer() module so state can handle localhost peering attempts.
 2016-02-09 10:51:58 -07:00
Mike Place
8518655bfb Merge pull request #31042 from moltob/fix-archive-winpath 
Allow using Windows path in archive.extracted name attribute
 2016-02-09 10:47:20 -07:00
Mike Place
1950359580 Merge pull request #31012 from terminalmage/fix-gitfs-provider-lc 
Fix gitfs/git_pillar/winrepo provider to allow lowercase values
 2016-02-09 10:24:25 -07:00
Mike Place
3d8681b63e Merge pull request #31024 from jfindlay/dist_upgrade 
modules.aptpkg.upgrade: clarify dist-upgrade usage
 2016-02-09 10:20:57 -07:00
Mike Place
a0454ffb00 Merge pull request #31028 from twangboy/fix_installer 
Fix config overwrite by windows installer
 2016-02-09 10:20:24 -07:00
Mike Place
071b9d4904 Merge pull request #31031 from terminalmage/issue31014 
More complete fix for #31014
 2016-02-09 10:04:41 -07:00
Mike Pagel
9dcc617a53 Allow using Windows path in archive.extracted name attribute, including drive letter colon and backslashes. 2016-02-09 15:28:33 +01:00
Denys Havrysh
afdaefbf3d Add systemctl examples for RHEL 7 to the installation guide 2016-02-09 14:48:26 +02:00
Denys Havrysh
069a661eb1 Correct ZeroMQ4 repo install guide for RHEL 2016-02-09 14:33:18 +02:00
Denys Havrysh
d2a9d67b5b Update installation instruction for community repos on RHEL 2016-02-09 13:57:58 +02:00
Denys Havrysh
bbdf2523c8 Add workaround for RHEL 7 systems mentioned in the issue #29094 2016-02-09 12:32:57 +02:00
Erik Johnson
6d15a17d6b Fix yumpkg _get_branch_option() 
Needs to be returning a list
 2016-02-09 01:15:14 -06:00
Erik Johnson
4b855a85ee Don't handle epoch specially for dnf 
Epoch handling is done in salt.utils.pkg.rpm.parse_pkginfo() now, so
remove special handling for dnf and make both yum and dnf work the same.
 2016-02-08 21:09:43 -06:00
Erik Johnson
5244de2fae More efficient way to add the epoch before version number 2016-02-08 21:08:51 -06:00
twangboy
baffbbdb74 Comment multiprocessing line in minion config 2016-02-08 18:14:17 -07:00
twangboy
933544b8c8 Set multiprocessing to true in config.py 2016-02-08 18:13:07 -07:00
twangboy
8876893b5c Fix remove placeholder files 2016-02-08 17:51:36 -07:00
twangboy
788855cc94 Remove placeholder files 2016-02-08 17:42:07 -07:00
twangboy
c834a9d5e5 Set overwrite to off 
Remove place holder files (empty)
 2016-02-08 17:29:39 -07:00
Colton Myers
2b8f7a12e7 Merge pull request #31026 from terminalmage/issue30934 
Fix regression when contents_pillar/contents_grains is a list.
 2016-02-08 17:03:15 -07:00
Nick Young
730b5ef3e2 Update tests to cover new peering return val. 2016-02-09 10:58:44 +11:00
Erik Johnson
f43aaf4dff Fix regression when contents_pillar/contents_grains is a list. 
Resolves #30934.
 2016-02-08 16:47:02 -06:00
Justin Findlay
3d1be080ad modules.aptpkg.upgrade: clarify dist-upgrade usage 
Fixes #30983.
 2016-02-08 15:18:32 -07:00