Joseph Hall
7832960a87
Merge pull request #20397 from kim0/freebsd-status.diskstats
...
Freebsd status.diskstats
2015-02-05 12:19:05 -07:00
Joseph Hall
b34b53e5b2
Merge pull request #20388 from kim0/freebsd-status.netstats
...
Implement freebsd status.netstats
2015-02-05 12:16:46 -07:00
Joseph Hall
28947ff0e7
Merge pull request #20391 from kim0/freebsd-status.vmstat
...
Implement freebsd status.vmstats
2015-02-05 12:15:31 -07:00
Joseph Hall
0764519c62
Merge pull request #20423 from techhat/useragent
...
Add user-agent to salt.utils.http
2015-02-05 12:06:44 -07:00
Joseph Hall
b0eb161424
Merge pull request #20361 from cachedout/ramfs_size
...
Don't remount ramfs on size change
2015-02-05 12:05:54 -07:00
Joseph Hall
e11ca9e3bc
Merge pull request #20336 from Unity-Technologies/osx-archive-user
...
Fixed extracting an archive as a given user
2015-02-05 12:04:53 -07:00
Joseph Hall
9c234c49ad
Merge pull request #20403 from kim0/freebsd-status.diskusage
...
Implement freebsd status.diskusage
2015-02-05 11:53:08 -07:00
Mike Place
36efd43254
Merge pull request #20401 from jacksontj/2015.2
...
Misc backports to 2015.2
2015-02-05 10:26:40 -07:00
Joseph Hall
0cab74e8f2
Linting
2015-02-05 10:00:08 -07:00
Joseph Hall
e6d38d663f
Linting
2015-02-05 09:58:29 -07:00
Joseph Hall
b4b32ce320
Remove requests from the thin tarball
2015-02-05 08:11:00 -07:00
Joseph Hall
637dc9610a
Add user-agent to salt.utils.http
2015-02-05 07:58:25 -07:00
Joseph Hall
b94b2e6204
Merge pull request #20412 from rallytime/fix_azure_stacktrace
...
Cast ssh_port as an integer to stop stacktrace when provising azure instances
2015-02-04 17:25:02 -07:00
rallytime
7fd29d35d5
Cast ssh_port as an integer to stop stacktrace when provising azure instances
2015-02-04 17:06:45 -07:00
Jeremy Rosenbaum
2b314eed45
fix syndic getting user from kwarg
2015-02-04 15:28:55 -08:00
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -07:00
Daniel Wallace
c9f4b420d5
only overwrite password if win_password is set
...
for rackspace.py
2015-02-04 15:10:50 -07:00
Daniel Wallace
e132e77785
Only assign win_password if it actually is set
2015-02-04 15:08:54 -07:00
Ahmed Kamal
8e0feb9bb7
Implement freebsd status.diskusage
2015-02-05 00:02:55 +02:00
Thomas Jackson
8242688556
pylint again
2015-02-04 13:56:36 -08:00
Thomas Jackson
0400a49e22
Remove exit() from testing
2015-02-04 13:56:29 -08:00
Thomas Jackson
306f7fec5d
Split out error message for SystemExit
2015-02-04 13:56:18 -08:00
Thomas Jackson
1003dfb536
Don't let exit()'s within modules stop the daemons.
...
This change catches those and just logs the error instead of exiting.
Conflicts:
salt/loader.py
2015-02-04 13:56:11 -08:00
Thomas Jackson
0f1956fd8a
Inject globals after verifying the function-- because it might not exist!
...
Conflicts:
salt/client/mixins.py
2015-02-04 13:49:53 -08:00
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
