valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,012 Commits 24 Branches 182 Tags 341 MiB
267704cd45
Commit Graph

35012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
267704cd45 Only assign win_password if it actually is set 2014-08-07 14:57:43 -04:00
Daniel Wallace
38cf53f393 i can't computer 2014-08-05 21:42:06 -04:00
Daniel Wallace
3ebd234a16 catch exception for crypt module on windows 2014-08-05 19:43:09 -04:00
David Boucha
245f423486 Merge pull request #14694 from zigarn/issue/14679 
Use win32 API to get user info in `user.info`
 2014-08-05 17:02:04 -06:00
David Boucha
ff39f09e1a Merge pull request #14639 from zigarn/issue/14638 
Fix `win_pkg.version` with multiple arguments
 2014-08-05 16:57:44 -06:00
Colton Myers
f0aba5f9db Merge branch '2014.7' into develop 2014-08-05 16:29:11 -06:00
David Boucha
0410524121 Merge pull request #14762 from UtahDave/2014.7 
add links to 2014.1.10 installers
 2014-08-05 16:20:48 -06:00
David Boucha
7e7f07927d add links to 2014.1.10 installers 2014-08-05 16:02:09 -06:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
Mike Place
87a88d0137 Merge pull request #14757 from rallytime/arch_test_fix 
Change install package to help Arch tests pass
 2014-08-05 15:09:24 -06:00
rallytime
6be33dcdc9 Change install package to help Arch tests pass 2014-08-05 14:35:32 -06:00
Thomas S Hatch
2fc69a1dba Merge pull request #14755 from thatch45/2014.7 
Add mod_aggregate to the release docs
 2014-08-05 13:28:45 -06:00
Thomas S Hatch
0e93ad1f28 Add mod_aggregate to the release docs 2014-08-05 13:26:30 -06:00
Thomas S Hatch
a048bb8945 Merge pull request #14751 from hulu/boto-secgroup-str-fmt-fix 
modules.boto_secgroup.authorize: fix string formatting
 2014-08-05 12:38:58 -06:00
Thomas S Hatch
99acb8537d Merge pull request #14754 from thatch45/2014.7 
lint
 2014-08-05 12:38:40 -06:00
Thomas S Hatch
5c2ccce1cf Merge pull request #14750 from hulu/fix-compact-output 
output.compact.output(): fix ref to output.highstate.output()
 2014-08-05 12:38:21 -06:00
Thomas S Hatch
81bd88368f lint 2014-08-05 12:38:02 -06:00
Joseph Hall
3ad02ba4e2 Merge pull request #14748 from Linuturk/windows-password 
should use password provided by API if it isn't specified in the configu...
 2014-08-05 12:35:01 -06:00
Chris Rebert
0d0156acfd modules.boto_secgroup.authorize: fix string formatting 
************* Module salt.modules.boto_secgroup
salt/modules/boto_secgroup.py:307: [E1306(too-few-format-args), authorize] Not enough arguments for format string
 2014-08-05 11:28:37 -07:00
Chris Rebert
142adffbe3 output.compact.output(): fix ref to output.highstate.output() 
Seems to have been accidentally broken when adjusting the style of the module's imports.

************* Module salt.output.compact
salt/output/compact.py:34: [E1101(no-member), output] Module 'salt.output.highstate' has no '_output' member
 2014-08-05 11:20:50 -07:00
Thomas S Hatch
137ef0fe92 Merge pull request #14747 from thatch45/develop 
Merge and fix #14732
 2014-08-05 12:09:13 -06:00
Thomas S Hatch
494a17dcb5 Merge branch 'lyft-boto_secgroup-support-vpc' into develop 2014-08-05 12:08:20 -06:00
Justin Phelps
9c8e27cab8 should use password provided by API if it isn't specified in the configuration file. 2014-08-05 13:08:05 -05:00
Thomas S Hatch
d6e3e31a22 lint fixes 2014-08-05 12:08:05 -06:00
Thomas S Hatch
89c9d67695 Merge branch 'boto_secgroup-support-vpc' of https://github.com/lyft/salt into lyft-boto_secgroup-support-vpc 2014-08-05 12:07:40 -06:00
Thomas S Hatch
993e68d981 Merge pull request #14746 from thatch45/develop 
merge PR #14707 with fixes
 2014-08-05 12:01:33 -06:00
Thomas S Hatch
b24c433fc4 Merge pull request #14744 from cachedout/13920 
Fix broken core grains detection in localclient
 2014-08-05 12:01:13 -06:00
Thomas S Hatch
75443fef18 Merge pull request #14729 from nmadhok/fix-yaml-syntax 
Fixing YAML state syntax
 2014-08-05 11:50:51 -06:00
Thomas S Hatch
6c876be990 Merge pull request #14721 from nshalman/2014.7-esky-mysql 
SmartOS Esky: py27-mysqldb in build environment
 2014-08-05 11:48:31 -06:00
Thomas S Hatch
efa0850dfb Merge pull request #14717 from cachedout/14633 
SUSE patch from @etiennepouliot
 2014-08-05 11:48:04 -06:00
Thomas S Hatch
de170afbe4 Merge pull request #14715 from khrisrichardson/14426 
fix "AttributeError: 'str' object has no attribute 'get'" and happy lint
 2014-08-05 11:46:51 -06:00
Thomas S Hatch
b74f26e87d Merge branch 'deeprave-develop' into develop 2014-08-05 11:40:57 -06:00
Thomas S Hatch
01e8b979b7 claem up docstrings 2014-08-05 11:40:26 -06:00
Thomas S Hatch
2dcc04b659 lint fixes for #14707 2014-08-05 11:38:45 -06:00
Mike Place
7e073b5877 Lint 2014-08-05 11:27:30 -06:00
Thomas S Hatch
1efa135bed Merge branch 'develop' of https://github.com/deeprave/salt into deeprave-develop 2014-08-05 11:13:03 -06:00
Thomas S Hatch
b09565164e Merge pull request #14650 from garethgreenaway/14514_cron_name_test_true 
Fixes to cron.py state
 2014-08-05 11:02:51 -06:00
Mike Place
fc06c77e57 Fix broken core grains detection in localclient 
A stacktrace was being thrown and swallowed in the core os detection
because there was no __file__ attribute when run via localclient.

Refs #13920
 2014-08-05 10:48:14 -06:00
Joseph Hall
4c6e9e3594 Merge pull request #14740 from dudz94/develop 
Improve localemod.py for Ubuntu.
 2014-08-05 08:39:33 -06:00
Lucas TADAJEWSKI
6f7c31a33d Improve localemod.py for Ubuntu. 
Touch file before append.
 2014-08-05 16:04:58 +02:00
Khris Richardson
8222e84069 remove extraneous condition 2014-08-05 08:17:36 -05:00
Colin Johnson
d26b671b00 add vpc support in boto_secgroup execution module 2014-08-05 03:45:00 +00:00
Nitin Madhok
61eb4fb041 Fixing YAML state syntax 2014-08-04 21:32:38 -04:00
Joseph Hall
8a3cb618b2 Merge pull request #14727 from seegno/bugfix/multimaster-doc 
Add missing lines between the code block declaration and the body
 2014-08-04 17:55:00 -06:00
Alfredo Palhares
145670b459 Add missing lines between the code block declaration and the body 2014-08-05 00:40:18 +01:00
Joseph Hall
7cdaa500fa Merge pull request #14724 from s0undt3ch/2014.7 
Have pylint ignore the import error
 2014-08-04 15:56:54 -06:00
Pedro Algarvio
5ec25b3715 Have pylint ignore the import error 2014-08-04 21:56:45 +01:00
Gareth J. Greenaway
0b74b05688 Don't lower identifier either. 2014-08-04 13:45:33 -07:00
Gareth J. Greenaway
c5485d49ec Should not .lower the cmd 2014-08-04 13:45:32 -07:00
Gareth J. Greenaway
461e89db29 Ensure that identifier and cmd arguments to _check_cron are strings, as both returned from list_tab will be strings. 2014-08-04 13:45:32 -07:00