Commit Graph

37481 Commits

Author SHA1 Message Date
Thomas S Hatch
05c0ac3707 this cmd should be safe with a shell=False 2015-01-07 12:19:47 -07:00
Thomas S Hatch
51493482cc migrate for shadow 2015-01-07 12:18:32 -07:00
Thomas S Hatch
148643d0f8 Merge pull request #19456 from jfindlay/split_useradd
split useradd commands
2015-01-07 10:46:41 -07:00
Thomas S Hatch
75d33284fc Merge pull request #19454 from jfindlay/split_varnish
split varnish commands
2015-01-07 10:45:28 -07:00
Thomas S Hatch
d8a2fca232 Merge pull request #19438 from jfindlay/split_znc
split znc commands
2015-01-07 10:15:32 -07:00
Thomas S Hatch
b86cc4a5db Merge pull request #19437 from jfindlay/split_zpool
Split zpool commands
2015-01-07 10:15:12 -07:00
Thomas S Hatch
acc54dda23 Merge pull request #19430 from rallytime/bp-19073
Backport #19073 to 2014.7
2015-01-07 10:14:16 -07:00
Thomas S Hatch
41c58bf8af Merge pull request #19420 from jfindlay/split_win
Split windows commands
2015-01-07 10:11:30 -07:00
Thomas S Hatch
a0225079a5 Merge pull request #19324 from whiteinge/git_pillar-branch-env-mapping
Added git_pillar branch to environment mapping
2015-01-07 10:06:30 -07:00
Justin Findlay
ee90fd7703 split useradd commands 2015-01-07 09:46:21 -07:00
Justin Findlay
7d578dad43 split varnish commands 2015-01-07 08:29:39 -07:00
Justin Findlay
e50d36d0e5 split znc commands 2015-01-07 00:29:13 -07:00
Justin Findlay
160df66af7 fix some zpool docs and an error message 2015-01-07 00:18:59 -07:00
Justin Findlay
baf7011bb0 split zpool commands 2015-01-06 22:25:51 -07:00
Pedro Algarvio
10a7ead2df Add file perms pylint plugin specific settings 2015-01-06 21:23:19 -07:00
Pedro Algarvio
8976d00bbe Enable file permissions lint checker.
This will allow us to confirm that no modules are added to salt with the
wrong file permissions. Default file permissions is 0644.
2015-01-06 21:23:19 -07:00
Nicole Thomas
dbbab28cdc Merge pull request #19425 from s0undt3ch/2014.7
Ignore the file perms lint check
2015-01-06 18:22:01 -07:00
Pedro Algarvio
a9eaf187e1 Ignore the file perms lint check 2015-01-07 01:15:56 +00:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
Seth House
4080faea87 Allow arbitrary mapping for branch to environment in git ext_pillar
Closes #11575
2015-01-06 16:51:57 -07:00
Justin Findlay
d2c8f6ae7f split win_servermanager commands 2015-01-06 16:22:00 -07:00
Justin Findlay
24ee64c58f split win_dns_client commands 2015-01-06 16:22:00 -07:00
Mike Place
378639f141 Merge pull request #19416 from cachedout/jenkins_debug_version
Add debugging to jenkins script
2015-01-06 15:30:20 -07:00
Mike Place
75c067432f Add debugging to jenkins script 2015-01-06 15:29:21 -07:00
Thomas S Hatch
e923ff11e8 Merge pull request #19404 from eliasp/2014.7-states.service-dont-report-changes
Don't report changes when there aren't any
2015-01-06 14:05:36 -07:00
Nicole Thomas
83e451d392 Merge pull request #19401 from rallytime/test_fixes
Pylint and psutil unit test fixes for 2014.7 branch
2015-01-06 13:24:15 -07:00
Elias Probst
4b1413fc8a Don't report changes when there aren't any 2015-01-06 21:22:08 +01:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -07:00
Nicole Thomas
ec84d57aee Merge pull request #19397 from rallytime/bp-19396
Backport #19396 to 2014.7
2015-01-06 11:23:53 -07:00
Mike Place
88f3477772 These were unused and causing weird recursion errors in unit tests 2015-01-06 11:22:32 -07:00
rallytime
73ef44dd9f Pylint fix for 2014.7 branch 2015-01-06 11:14:06 -07:00
Thomas S Hatch
5452436bb2 Merge pull request #19394 from s0undt3ch/2014.7
Remove unused script
2015-01-06 11:06:55 -07:00
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00:00
Thomas S Hatch
6d3461d688 Merge pull request #19391 from lorengordon/2014.7
Update vcredist version, fixes saltstack/salt#19387
2015-01-06 10:28:11 -07:00
Thomas S Hatch
4566591f55 Merge pull request #19369 from eliasp/2014.7-states.mount_invisible-options
2014.7 states.mount invisible options
2015-01-06 10:22:43 -07:00
Thomas S Hatch
f5349e96a6 Merge pull request #19358 from rallytime/bp-19347
Backport #19347 to 2014.7
2015-01-06 10:18:18 -07:00
Loren Gordon
7f7c7bd337 Update vcredist version, fixes saltstack/salt#19387
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
2015-01-06 12:18:13 -05:00
Thomas S Hatch
aec0417e13 Merge pull request #19357 from rallytime/bp-19278
Backport #19278 to 2014.7
2015-01-06 10:18:08 -07:00
Thomas S Hatch
41bef7771e Merge pull request #19356 from rallytime/bp-19340
Backport #19340 to 2014.7
2015-01-06 10:17:49 -07:00
Thomas S Hatch
2775737859 Merge pull request #19355 from rallytime/bp-19247
Backport #19247 to 2014.7
2015-01-06 10:17:27 -07:00
Thomas S Hatch
c6b367095e Merge pull request #19354 from cachedout/avoid_open_mode_key_race
Avoid a race between multiple auth requests for a minion key
2015-01-06 10:17:09 -07:00
Thomas S Hatch
ce34da5bdc Merge pull request #19353 from rallytime/bp-18323
Backport #18323 to 2014.7
2015-01-06 10:16:37 -07:00
Thomas S Hatch
e31cd4208a Merge pull request #19352 from rallytime/bp-19280
Backport #19280 to 2014.7
2015-01-06 10:16:25 -07:00
Thomas S Hatch
4da0b59d7d Merge pull request #19378 from llinder/2014.7
Fixed undefined data variable in s3 utils
2015-01-06 10:01:05 -07:00
Thomas S Hatch
99de56f131 Merge pull request #19386 from eliasp/2014.7-modules.parted.mkpart-doc
Correct doc
2015-01-06 09:57:19 -07:00
Thomas S Hatch
aa84367d01 Merge pull request #19331 from Basis/data.p-race-condition
Write to temp file then move to data.p to avoid race condition
2015-01-06 09:39:47 -07:00
Elias Probst
febfc17270 Correct doc 2015-01-06 16:27:07 +01:00
Lance Linder
cf9bc435c5 Fixed undefined data variable in s3 utils 2015-01-05 23:46:02 -06:00
Elias Probst
6979767cd3
Add 'actimeo' to the invisible mount options 2015-01-06 01:54:35 +01:00
Elias Probst
c653d90ad4
Add 'intr' and 'retry' to the invisible mount options 2015-01-06 01:54:35 +01:00