valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,133 Commits 24 Branches 182 Tags 341 MiB
51d2710fc8
Commit Graph

45133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
f3111503da Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/utils/minions.py
 2015-02-04 14:15:45 -07:00
Colton Myers
e8b088a355 Merge pull request #20390 from basepi/eauthgroup17380 
[2014.7] Fix eauth group authentication (backport of #20281)
 2015-02-04 14:08:34 -07:00
Ahmed Kamal
68cd682d18 return numbers 2015-02-04 23:02:02 +02:00
Ahmed Kamal
82f3114c54 Implement freebsd status.diskstats 2015-02-04 22:59:26 +02:00
Ahmed Kamal
8d4a434f8c Implement freebsd status.vmstats 2015-02-04 22:14:43 +02:00
Marvin Frick
4c3a816c59 fixes weird wording in comment 2015-02-04 12:57:48 -07:00
Marvin Frick
5e897d8442 fixes a bug which broke eauth with group permissions 
Conflicts:
	salt/utils/minions.py
 2015-02-04 12:57:19 -07:00
Ahmed Kamal
7e3609a618 Enchant linter 2015-02-04 21:35:48 +02:00
Ahmed Kamal
fd18c577cf Implement freebsd status.netstats 2015-02-04 21:30:38 +02:00
Mike Place
aa645b5d98 Dumb pylint error 2015-02-04 10:40:14 -07:00
Aditya Kulkarni
9bf6066ade Merge pull request #20381 from pass-by-value/returner_call_change 
Add arg to returner call
 2015-02-04 12:12:25 -05:00
Aditya Kulkarni
fc7ad1d31e Add arg to returner call 2015-02-04 11:44:37 -05:00
Daniel Hobley
65031f2d30 Added the ability to pass env_vars to pip via the virtualenv.managed state 2015-02-04 15:25:44 +01:00
Kaithar
cfcec7a684 Make the value extraction a little smarter. 
The previous method of splitting on = then removing " had the problem of leaving a trailing new line, making the makeconf.present state always fail if given a valid comparison.  It would also fail to cope with inline comments and leading/trailing whitespace.
This code isn't foolproof but works as long as there's no quotes in the comment, or the string isn't quoted but the comment does have a quote in it.
 2015-02-04 02:33:20 +00:00
Mike Place
789da29075 Merge pull request #20366 from s0undt3ch/2015.2 
Remove unreachable code
 2015-02-03 19:27:01 -07:00
Mike Place
1a0f5e7fa7 Merge pull request #20365 from whiteinge/doc-grains-minionmods 
Pull grains into __opts__ before loading the execution modules
 2015-02-03 19:23:58 -07:00
Pedro Algarvio
6759cc9351 Remove unreachable code 2015-02-04 02:22:15 +00:00
Seth House
14bf9821a2 Pull grains into __opts__ before loading the execution modules 
Otherwise the platform specific modules won't be loaded since the grains
aren't available.
 2015-02-03 19:14:23 -07:00
Joseph Hall
97e3efecc6 Merge pull request #20364 from basepi/salt-ssh-msgpack20276 
Gate msgpack in salt.utils.http
 2015-02-03 17:33:04 -07:00
Colton Myers
8530ea2bd1 Gate msgpack in salt.utils.http 
Fixes #20276
 2015-02-03 17:23:14 -07:00
Nicole Thomas
9f3e31ad38 Merge pull request #20360 from basepi/pylint2015.2 
Fix a pylint error for auth/django.py
 2015-02-03 16:48:09 -07:00
Justin Findlay
b87615e277 document lowercase removal change 2015-02-03 16:27:41 -07:00
Mike Place
67dc51bcd4 Don't remount ramfs on size change 
Closes #20164
 2015-02-03 15:53:15 -07:00
Colton Myers
a3991a20ea Fix a pylint error for auth/django.py 2015-02-03 15:08:21 -07:00
Colton Myers
bf81188894 Merge pull request #20353 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-03 14:44:24 -07:00
Justin Findlay
9462b86c7f allow upper case letters in npm package names 
fixes #20329
 2015-02-03 13:52:21 -07:00
Nicole Thomas
6988ac8b65 Merge pull request #20351 from rallytime/bp-20316 
Backport #20316 to 2014.7
 2015-02-03 13:49:17 -07:00
Colton Myers
44bd4fb906 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/cli/__init__.py
 2015-02-03 13:26:11 -07:00
Colton Myers
8e01c9d86c Merge pull request #20312 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-03 13:17:18 -07:00
Sebastian Braun
c2d2db1aa2 added utc timestamp to event 2015-02-03 12:35:26 -07:00
Nicole Thomas
b63376523e Merge pull request #20347 from jfindlay/fix_sysctl_tests 
fix linux_sysctl_test failures caused by #20314
 2015-02-03 12:30:06 -07:00
Justin Findlay
8eab04bd69 fix linux_sysctl_test failures caused by #20314 2015-02-03 11:30:27 -07:00
Colton Myers
4828a9c2b4 Revert syspaths.py to upstream/2015.2 version 2015-02-03 10:50:05 -07:00
Nicole Thomas
51f240bda2 Merge pull request #20341 from rallytime/pylint_fifteen 
Pylint fix for 2015.2
 2015-02-03 10:29:09 -07:00
Aaron Bell
6a87cff21c Fixes #20322, check for existing cert, return CN (not ca_name) 2015-02-03 09:04:22 -08:00
rallytime
759ce02829 Pylint fix for 2015.2 2015-02-03 10:02:05 -07:00
Daniel Hobley
424cee9984 Fixed extracting an archive as a given user 
- Setting the file permissions after extracting as we might not have access to the cachedir
 2015-02-03 14:48:31 +01:00
Thomas S Hatch
c364b99441 Merge pull request #20328 from bbinet/fix-allow-hotplug 
Fix support for allow-hotplug in debian_ip network module
 2015-02-03 06:19:22 -07:00
Thomas S Hatch
ce863801e2 Merge pull request #20334 from thatch45/terminalmage-cli-pillar-override 
Terminalmage cli pillar override
 2015-02-03 06:09:53 -07:00
Thomas S Hatch
eec11f2b05 lint fix 2015-02-03 06:08:50 -07:00
Thomas S Hatch
887d25fce5 Merge branch 'cli-pillar-override' of https://github.com/terminalmage/salt into terminalmage-cli-pillar-override 2015-02-03 06:08:22 -07:00
Thomas S Hatch
a8e1129fb8 Merge pull request #20316 from glomium/event-utc 
Event _stamp should be UTC
 2015-02-03 06:00:10 -07:00
Thomas S Hatch
519b220734 Merge pull request #20314 from jfindlay/fix_deb_systemd 
fix systemd stacktrace on debian
 2015-02-03 05:58:48 -07:00
Thomas S Hatch
8ed1daba67 Merge pull request #20305 from rallytime/bp-20216 
Backport #20216 to 2014.7
 2015-02-03 05:55:24 -07:00
Thomas S Hatch
90b5497b49 Merge pull request #20278 from kim0/freebsd-status.netdev 
Implement freebsd status.netdev
 2015-02-03 05:49:19 -07:00
Bruno Binet
040e4f4b05 Fix support for allow-hotplug in debian_ip network module 
This patch restores support for allow-hotplug directive which have been dropped
by commit b2fa638d6d

When setting "hotplug: True" in network.managed state, this was not taken into
account and the allow-hotplug setting would be removed from
/etc/network/interfaces.
 2015-02-03 11:38:36 +01:00
Ahmed Kamal
cdfc9ea5c9 Import collections, not collections.defaultdict. Avoid polluting namespace 2015-02-03 10:27:23 +02:00
Thomas S Hatch
551a80745b Merge pull request #20306 from rallytime/bp-20266 
Backport #20266 to 2015.2
 2015-02-03 00:12:44 -07:00
Thomas S Hatch
6ead0f33be Merge pull request #20304 from basepi/saltsshmsgpack20276 
[2015.2] Catch msgpack errors from cmd.run for salt-ssh
 2015-02-03 00:12:20 -07:00
Erik Johnson
a9b54ecbc0 Add pillar argument to pillar.{ext,item,items} 
Now that the Pillar and RemotePillar classes support passing through
pillar data from the CLI, make this available to the pillar remote
execution module as well.
 2015-02-02 23:52:21 -06:00