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

24279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
c1eee828fd Slight tweak to earlier master troubleshooting page edit 2013-12-28 22:10:03 -06:00
Pedro Algarvio
6202b61723 Merge pull request #9479 from terminalmage/docs 
Enhancement to master troubleshooting docs
 2013-12-28 12:21:50 -08:00
Pedro Algarvio
a067057fea Merge pull request #9478 from terminalmage/sphinx 
Fix sphinx build warning
 2013-12-28 12:20:58 -08:00
Erik Johnson
2087462bd9 Enhancement to master troubleshooting docs 
Made some of the language more concise, and improved the example on
setting resource limits. /etc/security/limits.d/NN-something.conf is
the generally preferred method of setting resource limits.
 2013-12-28 14:18:24 -06:00
Erik Johnson
6286b28304 Fix sphinx build warning 
This fixes a sphinx build warning resulting from improperly formatted
argument names.
 2013-12-28 14:17:24 -06:00
Pedro Algarvio
7bb7ff8f2b Merge pull request #9470 from terminalmage/issue9468 
Allow git.current_branch to work with git<1.7.8
 2013-12-28 07:52:36 -08:00
Pedro Algarvio
717e32b54e Merge pull request #9472 from gravyboat/develop 
Cloud Troubleshooting doc version compatibility notes.
 2013-12-28 00:25:12 -08:00
Forrest Alvarez
49b3cc4ba5 Added an admonition to the cloud troubleshooting doc that addresses issue with version compatibility. 2013-12-28 06:01:08 +00:00
Erik Johnson
1b8ea83a14 Allow git.current_branch to work with git<1.7.8 
"git branch" and "git branch --list" are functionally identical, but the
"--list" parameter was not added to git until version 1.7.8, so older
versions of git (such as the one in the RHEL/CentOS 6 repositories) are
unable to successfully run this function.

This commit removes the "--list" from the git command used in this
function.
 2013-12-27 18:57:17 -06:00
Thomas S Hatch
fbad38cef6 Merge pull request #9469 from terminalmage/issue9341 
Don't run pkg.refresh_db before checking targets
 2013-12-27 16:26:57 -08:00
Thomas S Hatch
027f219bc7 Merge pull request #9467 from terminalmage/supervisord-options 
Add supervisord.options function
 2013-12-27 16:26:04 -08:00
Thomas S Hatch
65ba87c588 Fix #9171 2013-12-27 17:13:18 -07:00
Thomas S Hatch
331be47224 Pass over invalid low chunks 2013-12-27 16:42:03 -07:00
Thomas S Hatch
df6bb64c41 Catch errors in json parsing 2013-12-27 16:26:06 -07:00
Erik Johnson
7c3d0cc80d Don't run pkg.refresh_db before checking targets 
In 5a95286, a call to pkg.refresh_db was placed before the function that
checks to see which targeted packages need to be installed. This was
done specifically to make newly-added repos available to pkg states in
the same highstate run. This commit moves the refresh_db to the pkgrepo
state instead.
 2013-12-27 17:08:39 -06:00
Erik Johnson
1c1e2adf9b Add supervisord.options function 
I added this while troubleshooting a bug that turned out to already have
been fixed, but it seemed to still be useful.
 2013-12-27 16:32:02 -06:00
Thomas S Hatch
fdc8b7549c Fix #8733 2013-12-27 15:22:11 -07:00
Joseph Hall
33cf7c7aab Merge pull request #9466 from techhat/novafix 
Add timeout and correct credentials to nova.boot
 2013-12-27 14:23:26 -08:00
Joseph Hall
39e754afa1 Add timeout and correct credentials to nova.boot 2013-12-27 15:21:55 -07:00
Thomas S Hatch
85abd5e166 Initial commit for #8733 2013-12-27 15:10:41 -07:00
Thomas S Hatch
a57eaa9f2a Update pydsl to track deps based on env:sls to support fix for #9464 2013-12-27 14:57:49 -07:00
Pedro Algarvio
cc9310b1f0 Merge pull request #9465 from cachedout/unit-tests 
Integration test fix
 2013-12-27 12:31:56 -08:00
Mike Place
444cae7236 Integration test fix 
* oscodename should not have been removed.
 2013-12-27 13:25:05 -07:00
Thomas S Hatch
5fb19a43c9 Fix #9464 
Cross environment collisions were being improperly detected
 2013-12-27 12:47:18 -07:00
Colton Myers
5ff8dc95e8 Merge pull request #9463 from techhat/part_list 
Allow both partition.list and partition.part_list to work
 2013-12-27 10:45:17 -08:00
Joseph Hall
0c5aa217d2 Allow both partition.list and partition.part_list to work 2013-12-27 11:43:02 -07:00
David Boucha
981fb52f11 Merge pull request #9462 from UtahDave/develop 
skip pylint arg check because of decorators
 2013-12-27 10:28:45 -08:00
David Boucha
5105d4176c skip pylint arg check because of decorators 2013-12-27 11:25:00 -07:00
Thomas S Hatch
2f39e976d0 Only apply master centric options without minion data merge 
Fix #8271
 2013-12-27 11:18:07 -07:00
Pedro Algarvio
4607d38cd4 We're mock'ing, it's ok to ignore the PyLint warning. 2013-12-27 17:56:31 +00:00
David Boucha
abf38ed1d9 Merge pull request #9460 from UtahDave/develop 
use # for comments.  use 'is True'
 2013-12-27 09:42:17 -08:00
David Boucha
cf56718272 use # for comments. use 'is True' 2013-12-27 10:41:05 -07:00
David Boucha
5dffd6cd85 Merge pull request #9459 from UtahDave/develop 
add missing import. use "is True"
 2013-12-27 09:26:45 -08:00
David Boucha
f67673741a add missing import. use "is True" 2013-12-27 10:26:03 -07:00
David Boucha
27f19c7550 Merge pull request #9458 from UtahDave/develop 
remove whitespace
 2013-12-27 09:15:59 -08:00
David Boucha
5e0324c062 remove whitespace 2013-12-27 10:15:25 -07:00
Thomas S Hatch
8e3e4ae744 Merge pull request #9457 from cachedout/unit-tests 
Test framework updates
 2013-12-27 09:01:30 -08:00
Thomas S Hatch
5e1ac9f6d7 Merge pull request #9456 from vespakoen/bugfix/fix-incorrect-information-in-reclass-usage-docs 
Fixing inventory base uri key in Reclass documentation
 2013-12-27 09:00:21 -08:00
Thomas S Hatch
ca244119c2 Merge pull request #9455 from ffzg/develop 
Various Debian network fixes
 2013-12-27 08:59:38 -08:00
Thomas S Hatch
7c773b473f Merge pull request #9453 from Geo23589/Windows-File-Attributes 
Add Windows File Attributes
 2013-12-27 08:58:27 -08:00
Thomas S Hatch
a13419c74a Allow for pipes to be used on the salt-ssh raw 2013-12-27 09:49:43 -07:00
Mike Place
3510f85c2e Merge branch 'unit-tests' of https://github.com/cachedout/salt into unit-tests 
* 'unit-tests' of https://github.com/cachedout/salt:
  Auth system unit testing framework.
  Optimize imports.
  Minor spelling change.
 2013-12-27 09:41:52 -07:00
Mike Place
9a8b9ab49d Fix Ubuntu integration tests. 
Ubuntu changed the name of the software-properties package, breaking tests. Details here: https://bugs.launchpad.net/ubuntu/+source/ubuntu-meta/+bug/439566
 2013-12-27 09:40:07 -07:00
geo23589
f7f0cfaf01 add CLI 2013-12-27 00:08:56 -07:00
Koen Schmeets
8ddbe5b6ce Fixing inventory base uri key in Reclass documentation 2013-12-27 01:14:17 +01:00
Luka Blaskovic
b45984a7f5 Various Debian network fixes 
* MTU is not ethtool option, parse it even if interface is type bridge
* add 10gigabit ethtool speed parameter
* don't parse garbage addr parameter
 2013-12-27 00:20:32 +01:00
geo23589
451188b744 Add Windows File Attributes 2013-12-26 15:28:25 -07:00
Thomas S Hatch
2f228de438 Merge pull request #9452 from holmboe/rel-dates 
Add more release dates to docs
 2013-12-26 13:46:43 -08:00
Thomas S Hatch
21256213d4 Fix #8555 2013-12-26 14:44:59 -07:00
Henrik Holmboe
81f96463ae Add release dates for 0.9.x versions 2013-12-26 22:13:55 +01:00