Ahmed Kamal
dfeaa19b0e
Linter happiness
2015-02-10 04:54:17 +02:00
Ahmed Kamal
aa5ae496e0
Add support for upgrading named packages on FreeBSD pkgng
2015-02-10 04:38:20 +02:00
Nicole Thomas
3e2e9e3861
Merge pull request #20532 from rallytime/bp-20501
...
Backport #20501 to 2015.2
2015-02-09 17:10:30 -07:00
Nicole Thomas
525f00cb44
Merge pull request #20529 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-02-09 17:09:57 -07:00
Daniel Wallace
7d70cd19c4
add note about rackconnectv3 variable
2015-02-09 16:12:33 -07:00
Daniel Wallace
bbab6235e0
fix rackconnect v3 implementation
2015-02-09 16:12:33 -07:00
Colton Myers
eba17606b4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-09 15:37:25 -07:00
jfindlay
9246f64f9b
Merge pull request #20523 from terminalmage/fix-kwarg-parsing
...
Fix regression in arg parsing
2015-02-09 12:55:22 -07:00
Erik Johnson
ebf9a9b9d6
Fix regression in arg parsing
...
This keeps kwargs with newlines in them from being misidentifed as
positional rather than keyword arguments.
2015-02-09 12:36:21 -06:00
Erik Johnson
3e321fdb48
Add file-locking bugfix to 2014.7.2 release notes
2015-02-09 11:32:20 -06:00
Erik Johnson
e97d4635cd
Merge branch 'crasu-2014.7' into 2014.7
2015-02-09 09:52:39 -06:00
Christian Kraemer
56653cbfd5
Added closing of filehandle and removal of gitfs update.lk
2015-02-09 09:52:26 -06:00
Christian Kraemer
083b39e467
#18839 more linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
477d6d5d74
#18839 more linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
25da94c174
#18839 more linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
f28a5f164b
#18839 linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
434224ba0d
Fix file locking for gits fs see #18839
2015-02-09 09:51:18 -06:00
jfindlay
f9e1e43ec9
Merge pull request #20510 from eliasp/2014.7-issue-18689
...
Fix #18689 by handling psutil exceptions.
2015-02-09 08:11:12 -07:00
Elias Probst
35baba9e54
Fix #18689 by handling psutil exceptions.
...
The information of some processes can't be accessed on Windows when
they're run under the 'LOCAL SERVICE' account.
This caused exceptions which bubbled up into `ps.pgrep` and caused
there backtraces as described in #18689 .
2015-02-09 16:06:59 +01:00
Thomas Jackson
f4abce1d24
Add six import to loader
2015-02-07 14:55:31 -08:00
Thomas Jackson
640aff6378
Fix mis-naming from pylint cleanup
2015-02-07 14:55:30 -08:00
Thomas Jackson
438ede78ba
Support arbitrarily deep modules
...
Note: salt can still only *call* modules on the first depth, but they can then import anything below
2015-02-07 14:55:30 -08:00
Thomas Jackson
249096c292
Change modulekey for submodule test-- to avoid namespace collisions
2015-02-07 12:02:26 -08:00
Thomas Jackson
7605ba60a8
pylint
2015-02-07 12:02:26 -08:00
Thomas Jackson
ca5eac3936
Add support for submodules to LazyLoader
...
This was a feature that was inadvertently removed in #20274 , but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.
This includes the feature as well as tests.
2015-02-07 12:02:26 -08:00
Thomas Jackson
725708a04b
Correct tag name in loader tests
2015-02-07 12:02:23 -08:00
Thomas Jackson
bb89068010
Add "disabled" support
...
this allows you to "blacklist" modules.
Addition to #20274
Conflicts:
salt/loader.py
2015-02-07 12:02:03 -08:00
rallytime
15a140ece4
Moved tests/unit/loader.py to tests/integration/loader/loader.py
...
These are integration tests and not unit tests, so they should be
in the proper directory.
Also, fixed up the python 3 incompatability pylint errors.
2015-02-07 11:59:47 -08:00
Thomas Jackson
fb0d46f445
Pylint
2015-02-07 11:59:03 -08:00
Thomas Jackson
368e5a8e92
Add test for __func__alias__
2015-02-07 11:59:03 -08:00
Thomas Jackson
5ba53611c4
Remove some old unused code
2015-02-07 11:59:03 -08:00
Thomas Jackson
9ee188dd90
More loader tests
...
As well as an optimization on clear()
2015-02-07 11:59:01 -08:00
Thomas Jackson
fe2d141081
Add loader tests
2015-02-07 11:59:00 -08:00
Thomas Jackson
3348820058
Since clear() removes all modules, reloads are unecessary
2015-02-07 11:59:00 -08:00
Thomas Jackson
f7da6364ff
Minor performance improvement
2015-02-07 11:59:00 -08:00
Thomas Jackson
1772a280f4
If you have the module loaded, lets not require another hit to disk
2015-02-07 11:59:00 -08:00
Thomas Jackson
726f8dc2ac
Check that __context__ is always present, since it now is (properly)
2015-02-07 11:59:00 -08:00
Thomas Jackson
728e33a136
remove old deprecated mechanism
2015-02-07 11:58:56 -08:00
Thomas Jackson
3e9f9100e3
Fix process_virtual error_reasons
...
Never used, so I fixed it up to not be a list-- since you can only have one. We will also log this as an error, for now since the module is asking for an error
2015-02-07 11:58:56 -08:00
Thomas Jackson
8a1ef674ab
Misc cleanup
2015-02-07 11:58:56 -08:00
Thomas Jackson
d539380266
Cleanup FunctionWrapper
2015-02-07 11:58:56 -08:00
Thomas Jackson
e55919b0d1
Remove unecessary format, a string is always a string
2015-02-07 11:58:53 -08:00
Thomas Jackson
69f3f3dd0f
Move "pack" over to a dict
...
Since it doesn't make sense to allow for duplicate "name" pack items, we should just use a dict. This also makes sharing __context__ between all the plugins *significantly* cleaner
2015-02-07 11:58:50 -08:00
Thomas Jackson
f47df434e3
Inject globals after verifying the function-- because it might not exist!
...
Conflicts:
salt/client/mixins.py
2015-02-07 11:58:46 -08:00
Thomas Jackson
a55c155de4
Attempt dict access
...
Apparently SSH FunctionWraper breaks when you do just the "in" comparator
2015-02-07 11:57:45 -08:00
Thomas Jackson
d1b57764e6
Conditionally inject context (if no one else has)
2015-02-07 11:57:45 -08:00
Thomas Jackson
795fa12415
Remove test as well
...
Conflicts:
tests/unit/output/grains.py
Conflicts:
tests/unit/output/grains.py
2015-02-07 11:57:40 -08:00
Thomas Jackson
e1f8ea650f
Remove grains outputter
...
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
Conflicts:
salt/output/grains.py
Conflicts:
salt/output/grains.py
2015-02-07 11:57:14 -08:00
Thomas Jackson
df4dfc6635
Rename NewLazyLoader to LazyLoader (since the old one was deleted)
2015-02-07 11:55:27 -08:00
Thomas Jackson
55aa213bca
Some more cleanup to grains outputter, closer to working
...
Conflicts:
salt/output/grains.py
2015-02-07 11:55:23 -08:00
