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
59,352 Commits 24 Branches 182 Tags 341 MiB
78a7c34f2b
Commit Graph

59352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
d8dc81bb2c Merge pull request #29000 from kiorky/2015.8_lxc 
[Mergeable] Fix up LXC
 2015-11-18 11:02:47 -07:00
Mike Place
eedd50e7c3 Merge pull request #29014 from jfindlay/sysctl_col 
systemd module: remove unneeded col command
 2015-11-18 10:58:59 -07:00
Mike Place
a2e4a227e0 Merge pull request #29011 from rallytime/bp-28630 
Back-port #28630 to 2015.5
 2015-11-18 10:50:05 -07:00
Justin Findlay
d75e4d5d21 systemd module: line wrap function comment 2015-11-18 10:08:21 -07:00
Justin Findlay
960d2b936d systemd module: remove unneeded col command 
Fixes #28995.
 2015-11-18 10:07:36 -07:00
Petr Messner
7baccc1b05 Lint - newline before def 2015-11-18 09:09:09 -07:00
Petr Messner
9e5c16d4da Reading S3 credentials from Pillar 2015-11-18 09:09:09 -07:00
Petr Messner
a3216f813d Fixed requests HTTPError handler, it was still in urllib2 style 2015-11-18 09:09:09 -07:00
Mathieu Le Marec - Pasquet
a4d197821a LXC: doc 2015-11-18 13:34:56 +01:00
Mathieu Le Marec - Pasquet
43fb0eff02 lxc: remove useless and error prone uses_systemd knob 2015-11-18 13:34:53 +01:00
Mathieu Le Marec - Pasquet
7ec08cd41c Fix bootstrap delay kwarg exchange 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-11-18 13:08:20 +01:00
Colton Myers
ac85cfdbd0 Merge pull request #28983 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-17 17:49:36 -07:00
Colton Myers
1a4cd6002f Merge pull request #28982 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-11-17 17:49:32 -07:00
Colton Myers
f1c80ab943 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/utils/schedule.py
 2015-11-17 16:18:12 -07:00
Colton Myers
bfbb109fbd Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/fileclient.py
 2015-11-17 16:15:48 -07:00
C. R. Oldham
04095e3b74 Prevent stacktrace if something goes wrong retrieving inventory 2015-11-17 15:39:57 -07:00
C. R. Oldham
e7cbce15a5 Don't need to get grains at init time here now that we are confirming username and password differently. 2015-11-17 15:26:09 -07:00
C. R. Oldham
e42100cf8a Switch from admin_password and fallback_admin_password to a list of passwords to try. 2015-11-17 15:20:55 -07:00
Mike Place
f172a0ee03 Merge pull request #28969 from rallytime/bp-28825 
Back-port #28825 to 2015.8
 2015-11-17 13:43:30 -07:00
Erik Johnson
ec64ec85d6 Force file_roots environments to be strings 2015-11-17 14:15:36 -06:00
Erik Johnson
b2690140c7 Properly handle non-string saltenvs 
Force the saltenv to be a string, preventing AttributeError exceptions
in the various backends if someone passes an int/float as a saltenv.

Fixes #28911.
 2015-11-17 14:15:36 -06:00
Pedro Algarvio
40f4ac5b21 Add missing import 2015-11-17 13:07:06 -07:00
Pedro Algarvio
2c43da1578 Take into account a pygit2 bug 2015-11-17 13:07:06 -07:00
C. R. Oldham
4b382e977d Add 'versionadded' 2015-11-17 11:57:26 -07:00
rallytime
3614a88811 Add blade password example and make note of timeout 
Fixes #28945
 2015-11-17 10:13:24 -07:00
Mike Place
1e9214f4e4 Merge pull request #28787 from chrigl/fix-28784 
closes #28784
 2015-11-17 08:54:04 -07:00
Mike Place
edd26d763a Merge pull request #28949 from whiteinge/sync-sdb 
Add sync_sdb execution function
 2015-11-17 08:35:38 -07:00
Mike Place
d63344575a Merge pull request #28944 from rallytime/dellchassis-state-name-fix 
The ret result must contain 'name', not 'chassis_name' for the state compiler.
 2015-11-17 08:34:21 -07:00
Mike Place
fcef9f8995 Merge pull request #28957 from terminalmage/fix-docstring 
Fix version number for new state option
 2015-11-17 08:33:50 -07:00
Mike Place
5b680c938a Merge pull request #28950 from DSRCompany/pr/28812_which 
PR 28812 which test fix
 2015-11-17 08:32:16 -07:00
Mike Place
73719928f9 Merge pull request #28812 from isbm/isbm-which-decorator-enhancement 
Enhance 'which' decorator reliability
 2015-11-17 08:32:10 -07:00
Erik Johnson
f159000de2 Fix version number for new state option 2015-11-17 09:29:39 -06:00
Mike Place
facc34efed Merge pull request #28934 from terminalmage/issue27883 
git.latest: Add update_head option to prevent local HEAD from being updated
 2015-11-17 08:15:16 -07:00
Mike Place
7da93aad5b Merge pull request #28937 from rallytime/chassis-doc-fix 
Update dellchassis state example to use correct jinja syntax
 2015-11-17 08:12:28 -07:00
Dmitry Kuzmenko
18571000c5 Fix which test in PR#28812 2015-11-17 11:29:41 +03:00
Seth House
b0ec9ab25b Add sync_sdb execution function 2015-11-16 23:54:09 -07:00
rallytime
f3ea01bbfa Make sure dellchassis.blade_idrac has a name arg and a ret['name'] 2015-11-16 21:14:54 -07:00
rallytime
fb718539e9 The ret result must contain 'name', not 'chassis_name' for the state compiler 2015-11-16 20:42:54 -07:00
rallytime
d53713ddba We only need one fancy pillar example to match our state. 2015-11-16 20:08:52 -07:00
rallytime
e2926b1996 Update dellchassis state example to use correct jinja syntax 2015-11-16 16:42:32 -07:00
Thomas S Hatch
43da1bc4ce Merge pull request #28930 from twangboy/fix_28888 
Added missing import mmap required by file.py
 2015-11-16 16:17:23 -07:00
Erik Johnson
6a35a39ca5 Add update_head option to git.latest 
This option will allow the state to simply fetch and not update the
local HEAD if it differs from the desired remote revision.

Additionally, this commit modifies test=True output so that only changes
to the SHA1 are reported when test=True. This prevents executing
"prereq" requisites for minor changes like the remote URL if they would
not result in changes to the actual content in the local clone.
 2015-11-16 16:43:15 -06:00
Erik Johnson
3787f7ed00 Change return output of git.fetch to a dict 2015-11-16 16:38:19 -06:00
Erik Johnson
9ca0f8f440 Add redirect_stderr argument to cmd.run_all 
This allows cmd.run behavior with stderr redirected, while still
returning the dictionary from cmd.run_all, including the return code.
 2015-11-16 16:36:11 -06:00
twangboy
0653a04887 Fixed user.present / user.absent in windows 
Fixes: #28928
Updated `states/user.py` to work with the backported win_useradd.py
This is a regression caused by: #28627
 2015-11-16 14:51:16 -07:00
twangboy
f5c489eaad Added missing import mmap required by file.py 2015-11-16 13:45:27 -07:00
Christoph Glaubitz
8639e3e9c3 closes #28784 
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783, which was introduced in 2015.5.
 2015-11-16 20:30:37 +01:00
Mike Place
16ebda999e Merge pull request #28889 from jfindlay/aggregate 
state compiler: relax aggregate conditional check
 2015-11-16 10:39:24 -07:00
Mike Place
91a327bbce Merge pull request #28921 from rallytime/bp-25470 
Back-port #25470 to 2015.8
 2015-11-16 10:38:59 -07:00
Mike Place
3707eb1e7c Merge pull request #28922 from rallytime/release-notes-ver 
Change 2015.8.2 release note title to reflect proper version
 2015-11-16 09:47:33 -07:00