Commit Graph

34554 Commits

Author SHA1 Message Date
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
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
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
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
David Boucha
7e7f07927d add links to 2014.1.10 installers 2014-08-05 16:02:09 -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
99acb8537d Merge pull request #14754 from thatch45/2014.7
lint
2014-08-05 12:38:40 -06:00
Thomas S Hatch
81bd88368f lint 2014-08-05 12:38:02 -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
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
Mike Place
7e073b5877 Lint 2014-08-05 11:27:30 -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
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
Gareth J. Greenaway
7db4efb86d Fixing the case when the cmd for a cron job is updated but the changes don't reflect the change. 2014-08-04 13:45:32 -07:00
Pedro Algarvio
01c93db2cd __file__ is not set in an exec() context 2014-08-04 21:31:22 +01:00
Nahum Shalman
7a0044a8f5 SmartOS Esky: py27-mysqldb in build environment
Requested by @johngrasty
2014-08-04 16:15:17 -04:00
Thomas S Hatch
96314149c2 lint 2014-08-04 13:43:59 -06:00
Thomas S Hatch
53f963ba60 lint 2014-08-04 13:13:40 -06:00
Thomas S Hatch
84e0a0b1e3 Lint fixes 2014-08-04 13:07:47 -06:00
Mike Place
cc3e6ff389 SUSE patch from @etiennepouliot 2014-08-04 12:34:00 -06:00
Colton Myers
fab3c235ec Merge pull request #14713 from saltstack/bp-14700
Backport #14700 to 2014.7
2014-08-04 11:39:40 -06:00
Daniel Wallace
45c13d621f document the usage of userdata for cloud-init
closes #14643
2014-08-04 11:25:20 -06:00
Thomas S Hatch
604b54887a Merge pull request #14710 from whiteinge/state-event-tweaks
A few updates to the state.event runner
2014-08-04 11:11:11 -06:00
Thomas S Hatch
c51580e63b Merge pull request #14706 from alejansa/add_compact_output
Adds compact output method.
2014-08-04 11:06:25 -06:00
Thomas S Hatch
baa3655ee9 Merge pull request #14705 from NicholasTD07/add_newline_values_only
Add newline_values_only and flaten output methods.
2014-08-04 11:04:16 -06:00
Thomas S Hatch
fd89791d95 Merge pull request #14704 from Learnosity/2014.7
Add force_reset option to git.latest; fixes #10414
2014-08-04 10:57:40 -06:00
Colton Myers
60d6b00f0f Add pepa.py external pillar from develop to 2014.7
Ref #14454
Ref #14522
Ref #14538
Ref #14545
Ref #14548
Ref #14592
2014-08-04 10:44:44 -06:00
Thomas S Hatch
c7e16fbcb2 Merge pull request #14683 from eliasp/2014.7-states.file.managed-check-defaults
Also validate 'defaults' in states.file.managed
2014-08-04 10:41:44 -06:00