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
76,449 Commits 24 Branches 182 Tags 341 MiB
4991c922ae
Commit Graph

76449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4991c922ae Merge pull request #38123 from Da-Juan/thorium_fix 
Thorium fixes
 2016-12-08 10:48:05 -07:00
Mike Place
69e70a3dc6 Merge pull request #38135 from fictivekin/ec2-cloud-secgroups 
Security Groups for New EC2 Cloud Instances
 2016-12-08 10:46:44 -07:00
Mike Place
23478c3cb2 Merge pull request #38137 from fictivekin/rds-tags 
Apply Defined Tags to New RDS Instance
 2016-12-08 10:45:52 -07:00
Mike Place
6116df5dca Merge pull request #38155 from zhihan/patch-1 
Update the 'ports' option in bridge settings.
 2016-12-08 10:41:44 -07:00
Nicole Thomas
e04e26f4d8 Merge pull request #38146 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-08 10:28:23 -07:00
Seth House
eb25dfd1d1 Improve and clarify the rest_cherrypy /run docs (#38145) 
Refs #38139.
 2016-12-08 09:41:57 -07:00
Zhi Han
af8b675cc3 Update the 'ports' option in bridge settings. 
It seems space is right delimiter. On trusty I got the following error trying to bringing up the bridge:

$ ifup br0
interface em1,em2 does not exist!
 2016-12-08 10:22:11 -05:00
Seth House
912c034653 Merge pull request #38150 from jerrykan/fixbuglink 
Fix cherrypy SSL error bug link
 2016-12-08 01:46:12 -07:00
John Kristensen
896aa077be Fix cherrypy SSL error bug link 
The cherrypy project has been migrated from bitbucket to github, and
fortunately the bugs/issues were migrated as well.
 2016-12-08 14:19:50 +11:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
 2016-12-07 16:31:11 -07:00
Nicole Thomas
6026cb23b2 Merge pull request #38138 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 13:15:56 -07:00
rallytime
28b56ea3b4 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-07 13:14:28 -07:00
Nicole Thomas
90478ef25e Merge pull request #38130 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 13:11:19 -07:00
Nicole Thomas
86091db647 Skip daemon unit tests when running on Python 2.6 (#38134) 
When switching the daemon unit tests to using multiprocessing pipes,
this exposed a deep bug in Python 2.6. Let's skip these on 2.6.
 2016-12-07 13:09:19 -07:00
Jared McKnight
049161dcd0 fix for applying tags to new RDS instance 2016-12-07 14:56:52 -05:00
Jared McKnight
e38db3985b fix the security groups that get applied to a new instance 2016-12-07 14:52:39 -05:00
Nicolas Rouanet
256685f143 Lint fix 2016-12-07 20:35:03 +01:00
Mike Place
8f54371d22 Merge pull request #38115 from saltstack/revert-34643-shlex-quotes 
Revert "fix augeas module so shlex doesn't strip quotes"
 2016-12-07 11:51:14 -07:00
Mike Place
f4b6f815d4 Merge pull request #38132 from iddocohen/develop 
Fixing bug in log.py - used .copy instead of .copy()
 2016-12-07 11:48:19 -07:00
Mike Place
4c11f39030 Merge pull request #38128 from eradman/cwd_param 
Adjust description for param cwd
 2016-12-07 11:33:00 -07:00
Nicole Thomas
ae754e1069 Mock config.option call return for iptables unit test (#38131) 
Refs #31662
 2016-12-07 11:19:46 -07:00
Megan Wilhite
1a42e24e72 Fix beacon index (#38129) 
* add new beacon modules to index

* add salt.beacons.avahi_announce to index and release notes
 2016-12-07 10:44:53 -07:00
Nicole Thomas
bbdfcab7d9 Add versionadded tags for network module funcs (#38127) 2016-12-07 10:44:25 -07:00
Mike Place
fd06bab673 Merge pull request #38043 from MTecknology/2016.11 
Debian networking fix
 2016-12-07 10:32:17 -07:00
Thomas S Hatch
4b9a7f2295 Merge pull request #38107 from cachedout/supercede_38088 
Status beacon should raise proper exception
 2016-12-07 10:21:49 -07:00
Mike Place
73d724845d Change to log.debug per Tom 2016-12-07 10:21:21 -07:00
Iddo Cohen
9a9e443d36 Fixing bug in log.py - used .copy instead of .copy() 
Typo mistake which was fixed
 2016-12-07 18:06:45 +01:00
rallytime
4d7d9abb41 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-07 09:43:08 -07:00
Nicole Thomas
9ce1ae8388 Merge pull request #38105 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-07 09:41:41 -07:00
Eric Radman
15f9c09ebf Adjust description for param cwd 
On most Linux systems root's home directory is '/root', but this is not
true on other platforms. On MacOS 10.12 for example, it is '/var/root'
or '/var/private/root'.

Also, the salt master may not be running as root, so perhaps it is best
to avoid making any promises about the current working directory if
``runas`` is not specified.
 2016-12-07 11:13:04 -05:00
Mike Place
a19fbeb72e Merge pull request #37796 from iddocohen/develop 
Added beacon for tracing string within log
 2016-12-07 06:59:54 -07:00
Mike Place
da8f5ac0c6 Merge pull request #38101 from lorengordon/file-replace-note 
Clarifies file.replace behavior on symlinks
 2016-12-07 06:27:11 -07:00
Da-Juan
2f7e9bfe0d Stop keeping track of removed/rejected minions 
When a minion is deleted or rejected by thorium we need to remove its
tracking status from the registry/context.
 2016-12-07 14:24:49 +01:00
Mike Place
d3d98fd4eb Merge pull request #38102 from rallytime/fix-38091 
Add False + msg tuple return if requests is missing for zenoss module
 2016-12-07 06:24:37 -07:00
Mike Place
8c8cbc2734 Merge pull request #38104 from rallytime/bp-36794 
Back-port #36794 to 2016.3
 2016-12-07 06:23:48 -07:00
Da-Juan
c3ec3df5f0 Fix typo in stanza name 
Fix statreg stanza name to match the require statement and the docs in
salt/thorium/key.py
 2016-12-07 14:23:03 +01:00
Mike Place
da135b1b59 Fix docs 2016-12-07 06:21:02 -07:00
Mike Place
b131b93f20 Merge pull request #38108 from startupgrind/develop 
Fixes inability to remove untagged Docker images.
 2016-12-07 06:18:55 -07:00
Mike Place
d47761f349 Merge pull request #38113 from terminalmage/issue38090 
Revert changes to refresh tag for pkg states
 2016-12-07 06:11:14 -07:00
Mike Place
d4c34e0a58 Merge pull request #38120 from Da-Juan/2016.11 
Fix status beacon config default values
 2016-12-07 06:08:33 -07:00
Mike Place
6868089a87 Merge pull request #38114 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-07 05:45:04 -07:00
Mike Place
b9920e54ee Merge pull request #38109 from gtmanfred/2016.11 
mode needs to be an integer
 2016-12-07 04:58:23 -07:00
Da-Juan
7e4a35e8ad Fix status beacon config default values 
Config values are expected as lists not strings.
This fixes saltstack/salt#37976
 2016-12-07 12:55:35 +01:00
C. R. Oldham
92d0af5d07 Revert "fix augeas module so shlex doesn't strip quotes" 2016-12-06 16:39:15 -07:00
rallytime
fec9dec23a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/daemons_test.py
  - tests/unit/states/file_test.py
 2016-12-06 16:23:51 -07:00
rallytime
c906c8a0d5 Pylint fixes 2016-12-06 16:18:25 -07:00
Nicole Thomas
fd77dcbd0f Merge pull request #38103 from rallytime/bp-37283 
Back-port #37283 to 2016.11
 2016-12-06 16:12:59 -07:00
Nicole Thomas
5d9d6b9280 Merge pull request #38057 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-06 16:11:41 -07:00
Nicole Thomas
9969544653 Account for case where vim install already exists and is at an older version (#38112) 2016-12-06 16:07:56 -07:00
rallytime
7693437fa0 Use tgt_type instead of expr_form in new run_job_async func 2016-12-06 22:59:23 +00:00