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
38,549 Commits 24 Branches 182 Tags 341 MiB
3001b727ef
Commit Graph

38549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
3001b727ef Merge pull request #22126 from s0undt3ch/2014.7 
Update environment variables.
 2015-04-01 10:41:10 -06:00
Thomas S Hatch
47f542d28d Merge pull request #22025 from tjstansell/fix-21397 
fix #21397 - force glibc to re-read resolv.conf
 2015-04-01 10:37:17 -06:00
jfindlay
7d57a760bb Merge pull request #22235 from dhs-rec/2014.7 
Possible fix for 'puppet.run always returns 0 #20850'
 2015-04-01 09:16:28 -06:00
Nicole Thomas
63919a345e Merge pull request #22206 from s0undt3ch/hotfix/pep8-disables 
more pylint disables
 2015-04-01 08:59:38 -06:00
Shane Lee
9ab3d5e5b4 Merge pull request #22222 from twangboy/fix_installer 
Fixed problem with nested directories
 2015-04-01 08:08:05 -06:00
Dirk Heinrichs
9c8f5f8811 - Change default Puppet agent args to just 'test', which includes the former ones plus 'detailed-exitcodes'. 
- Exit properly depending on those detailed exit codes.
 2015-04-01 10:22:55 +02:00
Thomas S Hatch
c8378ff911 Merge pull request #22228 from garethgreenaway/20107_2014_7_scheduler_race_condition 
backporting #22226 to 2014.7
 2015-03-31 21:56:23 -06:00
Gareth J. Greenaway
20199351e6 backporting #22226 to 2014.7 2015-03-31 17:31:07 -07:00
twangboy
8615e8d403 Fixed problem with nested directories 2015-03-31 17:26:46 -06:00
Pedro Algarvio
30cf5f44d5 Update to the new disable alias 2015-03-31 23:32:55 +01:00
Nicole Thomas
8b726e3310 Merge pull request #22205 from twangboy/win_install 
Removed _tkinter.lib
 2015-03-31 14:59:23 -06:00
Pedro Algarvio
ca615cd92d Ignore W1202 (logging-format-interpolation) 
"Use % formatting in logging functions but pass the % parameters as arguments"
 2015-03-31 19:21:30 +01:00
Pedro Algarvio
a1586ef4f6 Ignore E8731 - do not assign a lambda expression, use a def 2015-03-31 19:13:58 +01:00
twangboy
864438389d Removed _tkinter.lib 2015-03-31 11:53:17 -06:00
Nicole Thomas
73aa39d3e2 Merge pull request #22183 from s0undt3ch/hotfix/pep8-disables 
Disable PEP8 E402(E8402). Module level import not at top of file.
 2015-03-31 06:14:01 -06:00
Pedro Algarvio
38f95ec4bb Disable PEP8 E402(E8402). Module level import not at top of file. 2015-03-31 09:41:04 +01:00
Pedro Algarvio
9649339232 Update environment variables. 
When running salt as a user which is not root, I've found out that, at
least pygit2, misbehaves.

Salt correctly changes to the desired user, but the environment is the
same as the root user. `libgit2` takes advantage of environment
variables to load `.gitconfig` and because the environ is kept as the
root user, it fails to load it.

```
[ERROR   ] Exception caught while initializing gitfs remote /var/cache/salt/master/gitfs/e3971c3f4ffa91eb057d362f6bfb3683: Error stat'ing config file '/root/.gitconfig': /var/cache/salt/master/gitfs/e3971c3f4ffa91eb057d362f6bfb3683: Error stat'ing config file '/root/.gitconfig'
```
 2015-03-31 09:35:35 +01:00
Thomas S Hatch
cf9b1f6ed8 Merge pull request #22168 from semarj/fix-data-cas 
fix cas behavior on data module
 2015-03-30 16:45:19 -06:00
Joshua Semar
a5b28ad24d fix tests return value 2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5 fix cas behavior on data module 
data.cas was not saving changes.  We now call dump after
receiving the change
 2015-03-30 16:01:28 -05:00
Nicole Thomas
d941579640 Merge pull request #22161 from rallytime/bp-21959 
Backport #21959 to 2014.7
 2015-03-30 13:49:34 -06:00
Nicole Thomas
9bf6f505d1 Merge pull request #22160 from rallytime/bp-22134 
Backport #22134 to 2014.7
 2015-03-30 13:49:20 -06:00
Nicole Thomas
f44b1d08af Merge pull request #22156 from amendlik/chef-solo-fix 
Fix arguments passed to chef-solo command
 2015-03-30 12:25:52 -06:00
Giuseppe Iannello
b9d55bc88a Changed argument name 
Renamed an argument to align to the naming convention of the render() method in all the other renderers. Incidentally fixes #21956
 2015-03-30 12:19:35 -06:00
Zach Boody
061d085445 Fixes #9960 2015-03-30 12:10:53 -06:00
Thomas S Hatch
36eca12cb9 Merge pull request #22121 from tjstansell/fix-20841 
fix #20841: add sls name from reactor
 2015-03-30 10:27:42 -06:00
Mike Place
4176c85377 Merge pull request #22122 from tjstansell/bp-20166 
backport #20166 to 2014.7
 2015-03-30 10:06:23 -06:00
Nicole Thomas
1440ffa930 Merge pull request #22145 from twangboy/winbuild 
Remove .chm files from windows build
 2015-03-30 09:26:47 -06:00
twangboy
110b0ef6f1 Remove .chm files from windows build 2015-03-30 14:26:30 +00:00
Adam Mendlik
11536f6cc5 Fix arguments passed to chef-solo command 2015-03-30 08:07:45 -06:00
Pedro Algarvio
f2ecac1b3c Merge pull request #22130 from terminalmage/fix-dockerio-typo 
Fix typo in docker.get_container_root
 2015-03-29 21:25:55 +01:00
Erik Johnson
0dd8d04915 Fix typo in docker.get_container_root 2015-03-29 12:56:20 -05:00
Todd Stansell
6750480707 backport #20166 to 2014.7 2015-03-28 12:38:49 -07:00
Todd Stansell
b2b554a696 fix #20841: add sls name from reactor 
The verify_high() function in state.py assumes there are __sls__ attributes in
the body when it is generating error messages.  When the data is originally
created from a reactor, that does not exist, so we inject the name of the
reactor sls files so that verify_high() can properly generate error messages if
it fails to compile.
 2015-03-28 12:30:19 -07:00
jfindlay
2a7404b1b2 Merge pull request #22113 from borgstrom/pyobjects-req-issue-2014.7 
Fix a bug with the implicit list handling in pyobjects requisites
 2015-03-28 11:21:51 -06:00
jfindlay
f0b78e2b1b Merge pull request #22109 from twangboy/win_install_ini 
Pull minion config settings from minion conf
 2015-03-28 11:18:45 -06:00
Evan Borgstrom
181df2e489 Fix a bug with the implicit list handling in pyobjects requisites 
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically.  This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
 2015-03-27 21:04:00 -07:00
twangboy
de85a03add Pull minion config settings from minion conf 2015-03-28 00:14:01 +00:00
jfindlay
6e5d0b4990 Merge pull request #22074 from borgstrom/pyobjects-reqs-2014.7 
Fix requisites missing from pyobjects that were introduced in 2014.7
 2015-03-27 12:51:07 -06:00
jfindlay
5a0f056e90 Merge pull request #22077 from ticosax/fix-doc-string 
states.docker: fix docstring
 2015-03-27 08:15:25 -06:00
Nicolas Delaby
6b96491a00 fix docstring 2015-03-27 10:06:08 +01:00
Evan Borgstrom
761eb5f7a1 Fix missing requisites that were introduced in 2014.7 2015-03-26 23:07:53 -07:00
Todd Stansell
7d5ce28b63 add appropriate exception types we might expect 2015-03-26 11:59:19 -07:00
Nicole Thomas
3423ec4568 Merge pull request #22053 from basepi/fixchef 
[2014.7] Don't use function call for default argument in chef.py
 2015-03-26 12:54:32 -06:00
Nicole Thomas
b636dbbc66 Merge pull request #22051 from twangboy/2014.7 
Fixed wmi issue
 2015-03-26 12:36:38 -06:00
Colton Myers
63648b4d30 Fix the lint 2015-03-26 12:34:49 -06:00
Colton Myers
89b9cc6812 Don't use function call for default argument 2015-03-26 12:17:00 -06:00
twangboy
c46fced173 Fixed wmi issue 2015-03-26 17:24:44 +00:00
Colton Myers
ddc7cebf2a Merge pull request #22042 from basepi/2014.7.4releasenotes 
[2014.7] Add 2014.7.4 release notes
 2015-03-26 09:04:00 -06:00
Colton Myers
74dcd7df1c Add 2014.7.4 release notes 2015-03-26 09:03:35 -06:00