Samuel M Smith
209fc21680
Fixed regression
2015-02-05 15:10:22 -07:00
Thomas S Hatch
ef3fd7ce90
Merge pull request #20431 from SmithSamuelM/sam_20150124
...
Changed test from str to basestring
2015-02-05 14:09:14 -07:00
Thomas S Hatch
79b3f0d7d0
Merge pull request #20430 from kim0/freebsd-status-is-done
...
FreeBSD support for module status .. is done (fixes #20045 )
2015-02-05 14:07:16 -07:00
Kaithar
cd5d70ca6e
Compare against None rather than basing off anything that evaluates true
2015-02-05 14:03:52 -07:00
Thomas S Hatch
ed640db3e5
Merge pull request #20398 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-02-05 14:02:30 -07:00
Thomas S Hatch
7943a60954
Merge pull request #20377 from Unity-Technologies/pass-envs-virtualenv
...
Added the ability to pass env_vars to pip via the virtualenv.managed sta...
2015-02-05 14:01:47 -07:00
Thomas S Hatch
6683046c0b
Merge pull request #20375 from rupeshta/mine_unit_tests
...
Mine unit tests
2015-02-05 14:01:12 -07:00
Thomas S Hatch
854165c536
Merge pull request #20371 from cournape/fix_https_handling_windows_installer
...
DOC: add certifi to get proper https support.
2015-02-05 14:00:44 -07:00
Mike Place
bc99eb80eb
Don't run cron as a user with -u on Linux
...
Fixes #19916
2015-02-05 13:57:11 -07:00
Thomas S Hatch
bf8d519221
Merge pull request #20357 from cachedout/pillar_compile
...
Don't try to compile empty pillars
2015-02-05 13:53:32 -07:00
Thomas S Hatch
9af5ee2e25
Merge pull request #20350 from cachedout/socket_iter
...
Avoid socket list changing during iteration
2015-02-05 13:50:23 -07:00
Thomas S Hatch
43b59d72dc
Merge pull request #20342 from atbell/GH-20322_fix_cert_creation_in_tls_module
...
Fixes #20322 , check for existing cert, return CN (not ca_name)
2015-02-05 13:48:26 -07:00
Ahmed Kamal
3bbcd60eb4
FreeBSD support for module status .. is done
2015-02-05 22:32:22 +02:00
Mike Place
c4e7bd6d27
Merge pull request #20429 from cachedout/prereq_keywords
...
Fix broken state.orch prereqs
2015-02-05 13:26:20 -07:00
Thomas Jackson
f01a5c5fbd
Pylint
2015-02-05 12:17:48 -08:00
Samuel M Smith
c7530ebd89
Changed test from str to basestring
...
in order to support python3 raet now may have unicode strings in msgs.
2015-02-05 12:58:09 -07:00
Mike Place
a55f556964
Fix broken state.orch prereqs
...
All prereqs using salt.state in orchestrations were broken when using prereqs. This resolves that.
2015-02-05 12:54:02 -07:00
Joseph Hall
fc22ca5790
Merge pull request #20389 from jfindlay/fix_pip_venv
...
fix pip venv regression, deprecate activate param
2015-02-05 12:51:15 -07:00
Joseph Hall
03166a2630
Merge pull request #20410 from jodv/2015.2
...
Backport: fix syndic getting user from kwarg
2015-02-05 12:45:31 -07:00
Joseph Hall
aee80341b7
Merge pull request #20368 from kaithar/feature/smarter-value-extraction
...
Make the value extraction a little smarter.
2015-02-05 12:41:24 -07:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Joseph Hall
35f45f7fcc
Merge pull request #20405 from rallytime/bp-14834
...
Backport #14834 to 2014.7
2015-02-05 12:23:42 -07:00
Joseph Hall
f1c3c63970
Merge pull request #20386 from cachedout/issue_19916
...
Don't run cron as a user with -u on Linux
2015-02-05 12:23:03 -07:00
Nicole Thomas
9e74a0c200
Merge pull request #20409 from jfindlay/fix_ssh_tests
...
only add successfully generated ssh keys to config
2015-02-05 12:22:07 -07:00
Joseph Hall
66b27d9c6c
Merge pull request #20344 from jfindlay/fix_npm_names
...
allow upper case letters in npm package names
2015-02-05 12:20:53 -07:00
Joseph Hall
c4cec24646
Merge pull request #20395 from jfindlay/mv_zsh_cmp
...
mv zsh completion to pkg/
2015-02-05 12:20:04 -07:00
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
969315bbda
Merge pull request #20415 from shahn/develop
...
Update Macports Portfile
2015-02-05 12:18:08 -07:00
Joseph Hall
6539930a7b
Merge pull request #20427 from kaithar/issue/mysql-null-test-fix
...
Fix for mysql pillar's ignore_null
2015-02-05 12:17:33 -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
cf2bc2d9c0
Merge pull request #20402 from cachedout/issue_19643
...
Copy perms of destination file when backing up
2015-02-05 12:08:30 -07:00
Joseph Hall
7da1181899
Merge pull request #20367 from robmessick/gem_list_upgrades
...
Add list_upgrades method to salt.modules.gem
2015-02-05 12:07:09 -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
4932cf6596
Merge pull request #20414 from borgstrom/pyobjects-import-as
...
Update documentation & tests following #18911
2015-02-05 12:02:17 -07:00
Joseph Hall
ab9ec6ba76
Merge pull request #20359 from patrickshan/develop
...
ignore null string from blkid output
2015-02-05 11:55:22 -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
Kaithar
529f4f6ae2
Compare against None rather than basing off anything that evaluates true
2015-02-05 17:28:45 +00: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
Thomas Jackson
b762c72a2a
Add test for __func__alias__
2015-02-05 09:20:30 -08:00
Thomas Jackson
e2184bd3ee
Remove some old unused code
2015-02-05 09:20:30 -08:00
Thomas Jackson
87d90bf980
More loader tests
...
As well as an optimization on clear()
2015-02-05 09:20:30 -08:00
Thomas Jackson
f2dea6a5e9
Add loader tests
2015-02-05 09:20:30 -08:00
Thomas Jackson
19132b1215
Since clear() removes all modules, reloads are unecessary
2015-02-05 09:20:30 -08:00
Thomas Jackson
d163f7b5ef
Minor performance improvement
2015-02-05 09:20:30 -08:00
Thomas Jackson
fb43ca4983
If you have the module loaded, lets not require another hit to disk
2015-02-05 09:20:30 -08:00
Thomas Jackson
307e5c1473
Check that __context__ is always present, since it now is (properly)
2015-02-05 09:20:30 -08:00
Thomas Jackson
259be3aa03
remove old deprecated mechanism
2015-02-05 09:20:29 -08:00
