Andrii Krykunenko
|
3f7f50b1d6
|
Fix wrong check for rvm script existence
|
2015-02-06 12:15:06 +01:00 |
|
Nimrod A. Abing (on kohima)
|
28e62b57b9
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-02-06 16:09:03 +08:00 |
|
Mike Place
|
67473c5408
|
Merge pull request #20446 from jacksontj/loader
Fix mis-naming from pylint cleanup
|
2015-02-05 20:55:17 -07:00 |
|
Mike Place
|
3c8217528e
|
Merge pull request #20444 from cachedout/async_client_outputter
Use correct outputter in asynclient mixin
|
2015-02-05 20:20:04 -07:00 |
|
Thomas Jackson
|
c8fdc9aaea
|
Fix mis-naming from pylint cleanup
|
2015-02-05 19:01:37 -08:00 |
|
Mike Place
|
7f2f0e8ec3
|
Fix double-call (thanks @s0undt3ch)
|
2015-02-05 18:12:06 -07:00 |
|
Mike Place
|
1202c36137
|
Use correct outputter in asynclient mixin
This is necessary for runners that specify an outputter in their allowed args
|
2015-02-05 17:51:09 -07:00 |
|
Joseph Hall
|
89d3cc2944
|
Ensure that creds is a dict (pagerduty)
|
2015-02-05 16:20:05 -07:00 |
|
Samuel M Smith
|
1c780e81b6
|
fixed bug where not using the random master if enabled
|
2015-02-05 15:58:30 -07:00 |
|
Samuel M Smith
|
3e5690a1f4
|
revert six.itervalues where not appropriate (most cases)
|
2015-02-05 15:50:38 -07:00 |
|
Mike Place
|
640b66238c
|
Merge pull request #20274 from jacksontj/loader
Loader overhaul to LazyLoader
|
2015-02-05 15:50:19 -07:00 |
|
Mike Place
|
864a674e0e
|
Merge pull request #20438 from basepi/cmdrunerrors
Return the data from cmd.run with cmd.shell
|
2015-02-05 15:39:12 -07:00 |
|
Colton Myers
|
084b0c81b0
|
Return the data from cmd.run with cmd.shell
|
2015-02-05 15:37:37 -07:00 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|