saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
59655 commits 34 branches 292 tags 803 MiB
Commit graph

59655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Misha Brukman
364006bcfb Added .editorconfig for easier editing. 
Editor Config allows local per-project configuration to be expressed in a single
file, which makes it easy for one to work across many repos with many projects,
each of which may have its own preferred indentation, spacing, EOL, encoding,
etc. styles.

This change just adds 4-space indent for Python; other rules can be added quite
easily. The file has a pointer to the project's homepage which explains how to
install editor-specific plugins to handle this config and how to extend this
config further.
 2015-10-04 21:35:51 -04:00
Nicole Thomas
8d1e066ef3 Merge pull request #27640 from stephen144/patch-1 
fix typo in default pillar path
 2015-10-02 16:48:19 -06:00
Stephen Medina
afcc12bc9b fix typo in default pillar path 
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
 2015-10-02 14:25:48 -07:00
Mike Place
d22ada02ca Merge pull request #27594 from DSRCompany/issues/23157_minor_fix_mistype 
Fixed minor mistype in executors init
 2015-10-02 13:30:49 -06:00
Mike Place
cdac8862ab Merge pull request #27604 from plastikos/bug-exception_path 
Fix module path to SaltCacheError
 2015-10-02 13:29:26 -06:00
Mike Place
151281520f Merge pull request #27634 from rallytime/linode_private_ips 
Add private IP functionality to the Linode driver
 2015-10-02 13:29:01 -06:00
Mike Place
e0b3a733c5 Merge pull request #27621 from silenius/grains_dns 
Grains dns
 2015-10-02 13:23:02 -06:00
rallytime
1d727a545d Require Network Helper over entire account 
Also fixed calling some functions so they don't stacktrace.
 2015-10-02 12:30:19 -06:00
rallytime
a20462b9d9 Allow private ips to be used with the linode driver 
Alos updated the docs to include more provider/profile options and how they're used.
 2015-10-02 12:06:05 -06:00
Nicole Thomas
281e4fd966 Merge pull request #27625 from eyj/snapshot-created-fix 
Fix boto_ec2.snapshot_created function race condition
 2015-10-02 09:56:53 -06:00
Nicole Thomas
2479145025 Merge pull request #27560 from lomeroe/boto_asg_add_remove_lc 
Boto asg add remove lc
 2015-10-02 09:39:44 -06:00
Nicole Thomas
d0eebe2a77 Merge pull request #27559 from lomeroe/boto_asg_vpc_fix 
vpc_id fix for boto_vpc.get_subnet_association
 2015-10-02 09:39:14 -06:00
Nicole Thomas
5fed31b823 Merge pull request #27548 from lomeroe/add_infoblox 
Add infoblox DNS mgmt
 2015-10-02 09:36:38 -06:00
Nicole Thomas
7020cefb61 Merge pull request #27539 from lomeroe/boto_iam_fixes 
boto_iam updates to function calls that were not passing arguments properly
 2015-10-02 09:27:01 -06:00
Julien Cigar
044608977c fix arg 2015-10-02 17:11:17 +02:00
Julien Cigar
779d8344f7 ; may be used as well to comment 2015-10-02 17:06:40 +02:00
EYJ
fc87d61011 Fix boto_ec2.snapshot_created function race condition 2015-10-02 15:16:39 +02:00
Julien Cigar
d27359c51e search may appear only once 2015-10-02 15:15:40 +02:00
Julien Cigar
3aeeeb289f add .. versionadded:: Boron 2015-10-02 13:50:13 +02:00
Ethan Moore
9a883d46d3 syntax fix 2015-10-02 10:11:38 +00:00
Ethan Moore
173c7a690a rebasing 2015-10-02 10:09:30 +00:00
Julien Cigar
abc90e5293 pylint 2015-10-02 12:01:11 +02:00
Julien Cigar
efee93138c add proxyminion stuff 2015-10-02 11:37:11 +02:00
Julien Cigar
dd6ec14b5b fix search list 2015-10-02 11:31:00 +02:00
Julien Cigar
b2bf7b0be3 s/None/'' 2015-10-02 11:22:10 +02:00
Julien Cigar
90a2df3f3a pylint + nameservers 2015-10-02 11:19:09 +02:00
Julien Cigar
80eab6e6b9 initial support for /etc/resolv.conf 2015-10-02 11:14:33 +02:00
Ethan Moore
6bb44d6dc6 rebasing 2015-10-01 21:13:35 +00:00
Julien Cigar
cc34a57ffe Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-10-01 22:45:51 +02:00
Thayne Harbaugh
2a76bdcee4 Fix module path to SaltCacheError 
* salt.exception.SaltCacheError => salt.exceptions.SaltCacheError
                                                    ^
 2015-10-01 14:37:25 -06:00
Ethan Moore
f4c9cd86ff Documentation updates with examples 
version added string
one module modification to standardize record_type parameter name
 2015-10-01 20:05:40 +00:00
Ethan Moore
82f11017f5 moving path kwarg to end of function definition 
added back debug entries that I removed previously
 2015-10-01 19:49:23 +00:00
Nicole Thomas
f94ed57ffd Merge pull request #27572 from lomeroe/fix_boto_ec2 
updating boto_ec2 module to get the vpc_id key out of the vpc_id dict…
 2015-10-01 10:04:17 -06:00
Nicole Thomas
e103f53b4f Merge pull request #27485 from lyft/boto-asg-scheduled-actions 
Add scheduled actions (like scaleup/scaledown actions) to boto_asg
 2015-10-01 09:18:19 -06:00
Pedro Algarvio
e2ad089265 Merge pull request #27562 from techhat/spmdeps 
Add dependency resolution to SPM
 2015-10-01 13:43:41 +01:00
Dmitry Kuzmenko
8069b11cff Fixed minor mistype in executors init 2015-10-01 12:28:45 +03:00
Joseph Hall
ef4e8b15a5 Updates as per @s0undt3ch 2015-09-30 19:32:30 -06:00
Mike Place
a2d46547dd Merge pull request #27500 from pravka/virt-improve-running-function 
Improve virt state module
 2015-09-30 16:06:15 -06:00
Ethan Moore
59b3e55ec8 lint fix, not sure why I was passing in an empty string as the 2nd value :/ 2015-09-30 20:14:52 +00:00
Ethan Moore
1e07d387c1 updating boto_ec2 module to get the vpc_id key out of the vpc_id dict returned from boto_vpc.get_subnet_association 2015-09-30 19:55:14 +00:00
Ethan Moore
ca3b895a30 trying to make lint happy... 2015-09-30 18:51:25 +00:00
Joseph Hall
37ba7aebbe Add dependency resolution to SPM 2015-09-30 12:44:27 -06:00
Ethan Moore
8ed1f9b1dc lint fixes 2015-09-30 18:20:00 +00:00
Ryan Lane
714a93900b Patch config.option 2015-09-30 10:04:10 -07:00
Mike Place
3db4f9e574 Merge pull request #27551 from silenius/develop 
import ipaddress from _compat module
 2015-09-30 10:42:00 -06:00
Mike Place
a668c3543b Merge pull request #27554 from pass-by-value/doc_sphinx_version 
Update Sphinx version number in docs
 2015-09-30 10:41:27 -06:00
Mike Place
706acc71a4 Merge pull request #27523 from hs-calc/patch-2 
Adds Manjaro to _OS_FAMILY_MAP in grains/core.py
 2015-09-30 10:11:30 -06:00
Aaron Bell
6c813acebd - added deprecation warnings for removed states 2015-09-30 11:57:03 -04:00
Aditya Kulkarni
18868de6ea Change Sphinx version number in docs 2015-09-30 11:46:06 -04:00
Julien Cigar
2708d13111 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-09-30 17:19:26 +02:00