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
46,466 Commits 24 Branches 182 Tags 341 MiB
960a7c8764
Commit Graph

46466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
960a7c8764 Merge pull request #22047 from whiteinge/doc-sdb-etcd 
Added the etcd sdb module to the module index
 2015-03-26 09:53:45 -06:00
Seth House
8e203c4a0a Added the etcd sdb module to the module index 2015-03-26 11:52:21 -04:00
Mike Place
f2c9dd787a Merge pull request #22044 from cachedout/etcd_sdb_rn 
Add etcd sdb to 2015.2 release notes
 2015-03-26 09:17:08 -06:00
Mike Place
6fb70ea874 Add etcd sdb to 2015.2 release notes 2015-03-26 09:13:28 -06:00
Mike Place
8d191563a8 Merge pull request #22043 from techhat/sdbetcd 
Add sdb driver for etcd
 2015-03-26 09:10:34 -06:00
Joseph Hall
cbb182ff0e Add sdb driver for etcd 2015-03-26 09:05:42 -06:00
Mike Place
8d9db93c0f Merge pull request #22037 from makinacorpus/dmi 
Fix dmidecode grains
 2015-03-26 08:57:46 -06:00
Thomas S Hatch
b160ec1c7a Merge pull request #22017 from basepi/tmpfile-ilo 
[2015.2] Move tmpfile to cachedir for ilo module
 2015-03-26 08:30:32 -06:00
jfindlay
30013cd79e Merge pull request #22027 from jfindlay/notes 
edited 2015.2.0 release notes
 2015-03-26 07:49:23 -06:00
Mathieu Le Marec - Pasquet
2fe7340c77 Fix dmidecode grains 
This fixes #22033
 2015-03-26 13:40:55 +01:00
Justin Findlay
7ac7b74621 add release note about reactor users for runners 2015-03-25 21:14:10 -06:00
Justin Findlay
9b1e3f7a2a wrap at 80 chars 2015-03-25 21:12:51 -06:00
Justin Findlay
88add58cef misc cachedout edits 2015-03-25 21:10:48 -06:00
jfindlay
0e91175992 Merge pull request #22010 from rallytime/bp-20028 
Backport #20028 to 2015.2
 2015-03-25 17:10:59 -06:00
Nicole Thomas
e7c7608ae2 Merge pull request #22018 from whiteinge/doc-sdb-modules-index 
Add sdb modules to the module index
 2015-03-25 16:36:50 -06:00
jfindlay
dad1fbd22c Merge pull request #22011 from rallytime/bp-21950 
Backport #21950 to 2015.2
 2015-03-25 15:52:11 -06:00
Mike Place
b0bd0b7aeb Merge pull request #22005 from cro/eauth_activedirectory 
Add ability to eAuth against Active Directory
 2015-03-25 15:41:56 -06:00
Seth House
264c08841e Added generated .rst files for the various sdb modules 2015-03-25 17:11:20 -04:00
Seth House
c2af83ea3e Added sdb modules to the module index 2015-03-25 17:08:19 -04:00
Colton Myers
50adca269c Move tmpfile to cachedir for ilo module 2015-03-25 14:58:15 -06:00
C. R. Oldham
4a8b8cf3ac Lint 2015-03-25 14:38:11 -06:00
Damian Myerscough
a6c6994f62 Gracefully stop the Salt Master 2015-03-25 14:24:02 -06:00
Arnold Bechtoldt
a46e5b224d bring back serial comma due to decision in #18952 2015-03-25 14:22:07 -06:00
Arnold Bechtoldt
d2eb6b6f0c highlighting names of arguments in err msg 2015-03-25 14:22:07 -06:00
Arnold Bechtoldt
406ef728be adding new argument dataset_pillar to salt.states.file.serialize() 2015-03-25 14:22:07 -06:00
C. R. Oldham
63ef74fcf0 Change many 'warn' to 'error' to help users with LDAP auth. 2015-03-25 13:33:37 -06:00
C. R. Oldham
2c6ac92ce5 Take cachedout's suggestion 2015-03-25 13:27:56 -06:00
Thomas S Hatch
c58fe8bc07 Update release notes back to Jan 29th 2015-03-25 13:23:38 -06:00
C. R. Oldham
2eb6d26995 Add authentication against Active Directory 2015-03-25 13:01:37 -06:00
C. R. Oldham
7421042dd2 Add authentication against Active Directory 2015-03-25 12:49:35 -06:00
Mike Place
f68518cd4f Merge pull request #21975 from tjstansell/fix-21952-2015.2 
fixes #21952 and corrects bug from #21878
 2015-03-25 12:48:26 -06:00
Mike Place
c0ec6d3f2c Merge pull request #21991 from thatch45/basename 
Apply the loaded_base_path fix to 2015.2
 2015-03-25 12:44:10 -06:00
Mike Place
88e48386b5 Merge pull request #21987 from jacksontj/2015.2 
Workaround for #21651
 2015-03-25 12:41:28 -06:00
Nicole Thomas
31d45bc782 Merge pull request #21990 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-03-25 10:26:05 -06:00
Thomas S Hatch
5da6ea1eaf Apply the loaded_base_path fix to 2015.2 2015-03-25 09:52:20 -06:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
 2015-03-25 09:28:04 -06:00
Thomas Jackson
64b2a67582 Workaround for #21651 
It seems that the runner and wheel systems are completely fine setting arbitrary users. When we go through the publish system we run into access issues.

Since this does solve the recursion problem partially I'll leave it in for now, but scope it to just runner and wheel. This should unblock our RC.
 2015-03-25 08:00:10 -07:00
Thomas S Hatch
c54c6ceef8 Merge pull request #21983 from techhat/issue21917 
Pass auth from fileclient to http.query()
 2015-03-25 08:41:46 -06:00
Thomas S Hatch
6424984ee3 Merge pull request #21974 from tjstansell/fix-21952-2014.7 
fixes #21952 - only read ssh host_key header for legacy binary format
 2015-03-25 08:41:21 -06:00
Thomas S Hatch
7e36c57044 Merge pull request #21972 from tjstansell/fix-21971 
fix #21971 - ssh_host_key.pub should return as key.pub not key.pub.pub
 2015-03-25 08:40:45 -06:00
Nicole Thomas
47482718e0 Merge pull request #21984 from techhat/winstr 
Retries should be int, not str
 2015-03-25 08:35:04 -06:00
Joseph Hall
07903adb2f Retries should be int, not str 2015-03-25 07:16:59 -06:00
Joseph Hall
dfe328d334 Pass auth from fileclient to http.query() 2015-03-25 07:12:14 -06:00
Todd Stansell
383e21bc7b fix #21971 - ssh_host_key.pub should return as key.pub not key.pub.pub 2015-03-24 23:46:56 -07:00
Todd Stansell
3d8ff7a1ac fixes #21952 and corrects bug from #21878 - for 2015.2 branch and develop 
only read ssh host_key header for legacy binary format in private key
 2015-03-24 23:26:43 -07:00
Todd Stansell
4aaacfde40 fixes #21952 - only read ssh host_key header for legacy binary format of private key 2015-03-24 23:20:47 -07:00
jfindlay
b409209b47 Merge pull request #21968 from ryanwohara/2014.7 
Verifying the key has a value before using it.
 2015-03-24 22:03:08 -06:00
jfindlay
dd37f431fb Merge pull request #21962 from rallytime/apply_nested_outputter_fix_to_2014.7 
Apply nested outputter optimization fix to 2014.7
 2015-03-24 22:02:11 -06:00
Ryan W. O'Hara
cbb09b0a14 Verifying the key has a value before using it. 2015-03-24 22:44:05 -04:00
Joseph Hall
30eb9f2f58 Merge pull request #21960 from twangboy/win_ssl_19969 
Added certifi to fix ssl bug in windows
 2015-03-24 19:37:02 -06:00