valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,715 Commits 24 Branches 182 Tags 341 MiB
c4954046ad
Commit Graph

38715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
51370ab2f9 Removed dialog box that was used for testing 2015-04-03 00:17:12 +00:00
twangboy
7377c503de Add switches for passing version to nsi script 2015-04-03 00:13:58 +00:00
Thomas S Hatch
4281cd67fa Merge pull request #22300 from rallytime/windows_release_docs 
Add windows package installers to docs
 2015-04-02 17:45:38 -06:00
Mike Place
8558542930 Merge pull request #22308 from whiteinge/doc-reactor-what-where-how 
Better explanations and more examples of how the Reactor calls functions
 2015-04-02 17:21:19 -06:00
Seth House
a8bdc17bbf Better explanations and more examples of how the Reactor calls functions 
Refs #20841
 2015-04-02 17:07:22 -06:00
jfindlay
4d0ea7a863 Merge pull request #22266 from twangboy/win_install_fix 
Win install fix
 2015-04-02 12:59:31 -06:00
Thomas S Hatch
2bb9760e36 Merge pull request #22288 from nshalman/smartos-pkgsrc2014Q4 
SmartOS Esky: pkgsrc 2014Q4 Build Environment
 2015-04-02 12:52:38 -06:00
Mike Place
f474860dee Merge pull request #22280 from s0undt3ch/issues/19923-rackspace-config-drive 
Don't pass `ex_config_drive` to libcloud unless it's explicitly enabled
 2015-04-02 09:28:34 -06:00
Nahum Shalman
a51a90c128 SmartOS Esky: pkgsrc 2014Q4 Build Environment 
Need to clean up /var/db/pkgin
Need to install mysql-client explicitly
libzmq seems to link against libsodium... drag it along.
 2015-04-02 11:27:22 -04:00
Pedro Algarvio
65e5bac226 Pass it to libcloud if the user has set it in the configuration, True, or False. 2015-04-02 10:55:31 +01:00
Pedro Algarvio
23e735437c Don't pass ex_config_drive to libcloud unless it's explicitly enabled 
Fixes #19923
 2015-04-02 10:50:55 +01:00
twangboy
41a96d4daa Fixed hard coded version 2015-04-01 22:14:35 +00:00
twangboy
82b2f3e637 Removed message_box i left in for testing 
I'm an idiot
 2015-04-01 22:11:08 +00:00
Thomas S Hatch
5129f215e4 Merge pull request #22256 from twangboy/fix_pip_install 
Fixed pip.install for windows
 2015-04-01 13:02:13 -06:00
twangboy
3792ea1d10 Fixed pip.install for windows 2015-04-01 11:48:03 -06:00
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
rallytime
1abaacd868 Add windows package installers to docs 2015-03-30 16:10:10 -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