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,613 Commits 24 Branches 182 Tags 341 MiB
ac7174f9f6
Commit Graph

35613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
b7eb6a5c09 Moved the Formula repository structure docs to the bottom 
We should describe best practices for writing formulas first.
 2014-08-06 10:45:15 -04:00
Seth House
f741aee4a4 Improve and clarify the Formula docs on using formulas from non-formulas 2014-08-06 10:39:48 -04:00
Seth House
3f7118dd8b Improved the Formula installation docs with examples 2014-08-06 10:39:47 -04:00
Seth House
f819a1e85c Improved the simple Formula usage example at the top 2014-08-06 10:39:47 -04:00
Seth House
b224efc0d2 Added link targets to a few requisite types 2014-08-06 10:39:47 -04:00
Seth House
20dd4b42de Updated the Formula README recommendation 2014-08-06 10:39:47 -04:00
Seth House
1815e24fe9 Improve and shorten the Formula lookup table recommendation 2014-08-06 10:39:41 -04:00
Seth House
b46d087966 Moved the Formula Conventions CHANGELOG section down next to Versioning 
This section is less important for new users than the mapfile and sls
recommendation sections.
 2014-08-06 10:34:42 -04:00
Seth House
93da920147 Removed 0.17 requirement note from formula docs 
0.17 is no longer a supported release.
 2014-08-06 10:34:41 -04:00
Joseph Hall
91bebba275 Merge pull request #14786 from pabluk/fix-versions-shadow-module 
Added versionadded directives to shadow module
 2014-08-06 05:11:41 -06:00
Pablo SEMINARIO
69f159b8ce Added versionadded directives to shadow module 2014-08-06 09:57:55 +02:00
Tim Serong
372d68180c Disable service.py for entire SUSE family >= 12 
Checking os_family allows us to pick up openSUSE and SUSE Linux Enterprise, rather than just checking for os == openSUSE.
 2014-08-06 16:33:07 +10:00
Erik Johnson
5f9931636a Deploy /var/cache/salt with common RPM 
Also changed the deprecated $RPM_BUILD_ROOT to %{buildroot}.
 2014-08-05 22:15:34 -05:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
Daniel Wallace
38cf53f393 i can't computer 2014-08-05 21:42:06 -04:00
Daniel Wallace
372c2f35b2 Dont set upstream if ref is HEAD 
If the ref is HEAD, the we should be in a detached HEAD, and thus don't
have a remote, so there is no point in setting this.
 2014-08-05 21:36:07 -04:00
Joseph Hall
7dcbbe9cf9 Merge pull request #14777 from hulu/pulp-fiction 
copyedit doc/topics/releases/2014.7.0.rst
 2014-08-05 19:34:35 -06:00
Chris Rebert
100d831ca9 copyedit doc/topics/releases/2014.7.0.rst 2014-08-05 18:31:36 -07:00
Joseph Hall
b596dc37de Merge pull request #14776 from techhat/lesten 
Stop lestening to bad spelling
 2014-08-05 19:24:24 -06:00
Daniel Wallace
04a63246e3 expect head instead of an empty string branches 
If the branch is detached, git rev-parse will return HEAD, instead of an
empty string.
 2014-08-05 20:10:43 -04:00
Daniel Wallace
d676f06c25 remove grep and use rev-parse 2014-08-05 20:04:49 -04:00
Daniel Wallace
3ebd234a16 catch exception for crypt module on windows 2014-08-05 19:43:09 -04:00
Colton Myers
ec39df3263 Merge branch '2014.7' into develop 2014-08-05 17:36:23 -06:00
Colton Myers
06127b5265 Merge pull request #14769 from saltstack/bp-14715 
Backport #14715 to 2014.7
 2014-08-05 17:35:16 -06:00
Colton Myers
34f46e8071 Merge pull request #14767 from saltstack/bp-14656 
Backport #14656 to 2014.7
 2014-08-05 17:35:10 -06:00
Colton Myers
eac00d6d3f Merge pull request #14765 from saltstack/bp-14641 
Backport #14641 to 2014.7
 2014-08-05 17:35:05 -06:00
Colton Myers
36c9e8608c Merge pull request #14764 from saltstack/bp-14607 
Backport #14607 to 2014.7
 2014-08-05 17:34:48 -06:00
Colin Johnson
0e4b829ac5 provide support for VPC security groups in boto_secgroup state module 2014-08-05 23:18:26 +00: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
Khris Richardson
fa1bc7008b remove extraneous condition 2014-08-05 16:31:42 -06:00
Khris Richardson
104559da0e unhappy lint, happy salt.states.pkg 2014-08-05 16:31:42 -06:00
Khris Richardson
1da9cdc84d set default for getattr 2014-08-05 16:31:42 -06:00
Khris Richardson
ec79ad45ec fix "AttributeError: 'str' object has no attribute 'get'" and happier lint 2014-08-05 16:31:41 -06:00
Colton Myers
f0aba5f9db Merge branch '2014.7' into develop 2014-08-05 16:29:11 -06:00
Ash Berlin
10e75cc4c8 Fix for python 2.6 not having timedelta.total_seconds() 2014-08-05 16:22:57 -06:00
Kyriakos Oikonomakos
da1d6f3875 fix for issue #14655 2014-08-05 16:22:57 -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
Alexandre Garnier
83dffd6600 Fix win_pkg.list_upgrades 
Issue #14640: it was iterating one level too high in repo_data.
 2014-08-05 16:19:54 -06:00
Colin Johnson
ac9f1d3a3c Resolve - https://github.com/saltstack/salt/issues/14604 2014-08-05 16:12:52 -06:00
Erik Johnson
670e315c19 Update RPM spec for 2014.1.10 2014-08-05 17:02:35 -05: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
9d6808d7e5 Sketch of list support for key accept/delete 
Refs #14334

@thatch45, tell me what you think of this. Maybe it would be better to
do targets? Not sure.
 2014-08-05 15:29:41 -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
Mike Place
791411013c Prep ipv4/6 socket for syndic 
Fixes #14736
 2014-08-05 14:41:45 -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