valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,348 Commits 24 Branches 182 Tags 341 MiB
7cd029c9ed
Commit Graph

82348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
7cd029c9ed Merge pull request #41142 from FedericoCeratto/mysql_cache 
Implement MySQL-based minion data cache
 2017-05-30 10:59:32 -05:00
Mike Place
660ccbdb4f Merge pull request #41141 from FedericoCeratto/etcd_cache 
Implement etcd based minion data cache
 2017-05-30 10:01:44 -05:00
Federico Ceratto
57b91feb25 Implement etcd based minion data cache 2017-05-29 10:51:10 +01:00
Mike Place
0b6f8437cf Merge pull request #41349 from garethgreenaway/update_network_info_beacon 
Fixes to network_info beacon
 2017-05-26 16:51:39 -05:00
Mike Place
e18043e9ec Merge pull request #41468 from terminalmage/py3-tests 
Properly handle strings/bytestrings in Zookeeper/Docker
 2017-05-26 16:15:14 -05:00
Nicole Thomas
f2fc364ffd Merge pull request #41467 from terminalmage/squelch-error 
Squelch spurious error when loader processes slack engine
 2017-05-26 13:48:12 -06:00
Nicole Thomas
b58b36864c Merge pull request #41466 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-26 12:45:00 -06:00
Erik Johnson
f0335b6bbe Squelch spurious error when loader processes slack engine 
The of b402743b0a was likely unaware that this would result in this
message being logged every time the loader processes the slack engine.
This moves the logging to the proper place within the __virtual__ func.
 2017-05-26 13:08:30 -05:00
Erik Johnson
f574245a54 Zookeeper expects node values to be bytestrings 2017-05-26 12:59:40 -05:00
Erik Johnson
0d0f802e0d Decode bytestrings returned from docker-py 
This fixes pulls/pushes in Python 3.
 2017-05-26 12:41:49 -05:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Nicole Thomas
d2d5bfef18 Merge pull request #41441 from vitaliyf/patch-3 
Updated docstring in states/libcloud_dns.py
 2017-05-26 10:01:34 -06:00
Erik Johnson
a88048da51 Merge pull request #41438 from skizunov/develop3 
opkg: Include reinstalled packages in return dict
 2017-05-26 08:44:41 -05:00
Vitaliy Fuks
d9b4d73d28 Updated docstring in states/libcloud_dns.py 
Provided example wasn't valid syntax.
 2017-05-25 22:21:23 -04:00
Sergey Kizunov
8bae4783db opkg: Include reinstalled packages in return dict 
Previously, if packages were reinstalled, they were not included
in the return dictionary of `install()`. Fix this issue.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-05-25 16:33:37 -05:00
Mike Place
0d0747e54d Merge pull request #41380 from dmurphy18/salt_20175nb 
Updated remove Redhat 5 and MD5, utilize SHA256 building Redhat
 2017-05-25 16:17:08 -05:00
Daniel Wallace
27d9caac42 tag venafi as destructive and expensive 2017-05-25 15:15:49 -06:00
Mike Place
525b26c2b4 Merge pull request #41418 from twangboy/rem_raet_deps 
Remove RAET dependencies from Windows Installer
 2017-05-25 16:03:42 -05:00
Mike Place
6aafbec730 Merge pull request #41415 from rallytime/test-pr 
Remove unreachable code in infoblox module
 2017-05-25 16:02:59 -05:00
Mike Place
51dd95ddf0 Merge pull request #41426 from cloudflare/hipchat-eng 
Make the Hipchat engine more user friendly
 2017-05-25 15:34:46 -05:00
Nicole Thomas
8188ecf12b Merge pull request #41354 from tsaridas/minion_id_lowercase 
minion_id_lowercase
 2017-05-25 12:45:59 -06:00
Nicole Thomas
0b7dece612 Merge pull request #41425 from cloudflare/napalm-always-alive 
Small documentation improvements for the NAPALM proxy
 2017-05-25 12:43:50 -06:00
Nicole Thomas
36bc67e191 Merge pull request #41420 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-25 11:16:25 -06:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
7091a0b4aa specify when to run venafi tests 2017-05-25 10:27:40 -06:00
Daniel Wallace
e5f5514ec6 add venafi test 2017-05-25 10:26:54 -06:00
Daniel Wallace
1b517de988 pass password to unlock key 2017-05-25 10:26:54 -06:00
Daniel Wallace
436a5a61ff use password in gen_csr if provided 2017-05-25 10:26:54 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
Daniel Wallace
b0f9e57821 change default venafi api endpoint 2017-05-25 10:26:54 -06:00
Daniel Wallace
8cfb8fce76 use utils for http.query 2017-05-25 10:26:54 -06:00
Daniel Wallace
13b3680180 fix venafi typo 2017-05-25 10:26:54 -06:00
rallytime
ff0def408b Whitespace fix 2017-05-25 10:26:06 -06:00
Nicole Thomas
d2b741ecc7 Quick spelling fix 2017-05-25 10:22:16 -06:00
Nicole Thomas
f2a9039de2 Merge pull request #41427 from terminalmage/py3-tests 
Skip a test that doesn't apply to Python 3
 2017-05-25 09:51:51 -06:00
Erik Johnson
28a8605dea Skip a test that doesn't apply to Python 3 
This test is checking behavior that seems to have been specific to the
carbon package from PyPI. Since this is a Python 2-only module, and has
deps that do not exist on Python 3, it should not be run on Python 3.
 2017-05-25 09:37:35 -05:00
Mircea Ulinic
3dd1d59857 Better doc 2017-05-25 14:01:49 +00:00
Mircea Ulinic
35c6b49cf9 Better doc 2017-05-25 13:59:26 +00:00
Mircea Ulinic
de610b463b Allow code format and nicer notification display 2017-05-25 13:44:44 +00:00
Mircea Ulinic
d1082caa85 Send messages formatted as HTML 2017-05-25 12:56:49 +00:00
Mircea Ulinic
1f1f06fce4 Correct Example (engines specified as list) 2017-05-25 12:03:15 +00:00
Mircea Ulinic
832d9f6f1f Add output helpers for raw string and HTML 2017-05-25 11:50:47 +00:00
Mircea Ulinic
43221c0683 Document the new always_alive field 2017-05-25 11:26:59 +00:00
Mircea Ulinic
c752a6073a Correct faq ref 2017-05-25 11:20:37 +00:00
Mircea Ulinic
ad1faf58d9 Adding more cross references for Nitrogen modules 2017-05-25 11:18:52 +00:00
Mircea Ulinic
0d18758a99 Remove config_format opt arg example 2017-05-25 11:09:37 +00:00
Federico Ceratto
412070b841 Implement MySQL-based minion data cache 2017-05-25 11:29:02 +01:00
Nicole Thomas
14ceceac8d Merge pull request #41416 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-24 16:35:10 -06:00