Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: saltstack/salt
head fork: saltstack/salt
This comparison is big! We're only showing the most recent 250 commits
Commits on May 17, 2013
Thomas S Hatch thatch45 Only pass the retcode out to salt-call if retcode_passthrough is
set, first fix for #4904
Thomas S Hatch thatch45 Add valid_id commit to vulnerability report
Thomas S Hatch thatch45 Fix fomatting 2acabe7
Colton Myers basepi Fix some pep8 e7f1abf
Colton Myers basepi Handle leading | in fileclient, Fix #5013 36a6f0c
Pedro Algarvio s0undt3ch No need to define logger instead if log(which is properly, not signal…
…ed, by pylint). PEP-8 formatting fixes.
Chris Rebert cvrebert some copyediting of the stateconf renderer docs 12677ca
Chris Rebert cvrebert salt.renderers.stateconf.rst: add more missing spaces before open parens 95e3b51
Thomas S Hatch thatch45 Fix #5024 2e92850
Colton Myers basepi Fix check_state_result for salt-call --local, Fix #4904 62fbd3c
David Boucha UtahDave Add namespaced_function function
This will allow for imported functions to live under
the new global namespace.

Copied directly from saltcloud.utils
David Boucha UtahDave Properly namespace check_perms 0d52de7
David Boucha UtahDave namespace get_managed 75ca2dc
David Boucha UtahDave namespace makedirs_perms f68dfd0
David Boucha UtahDave add missing import ed503db
David Boucha UtahDave add missing import 45466dc
David Boucha UtahDave namespace manage_file 4ee9341
David Boucha UtahDave import __clean_tmp from ec25997
David Boucha UtahDave namespace source_list 1a0a71c
David Boucha UtahDave namespace maor stuff e848d15
David Boucha UtahDave namespace functions imported from 185fa45
David Boucha UtahDave remove unnecessary __clean_tmp function c06d686
David Boucha UtahDave remove unused import, add missing comma 1d8b13e
David Boucha UtahDave add import tempfile 52c621e
Colton Myers basepi Remove unnecessary `else` df4c0b4
Colton Myers basepi Handle args that were previously parsed into lists, Fix #5031 9c2c9e5
Sylvain Fankhauser sephii Rename build_whitepace_splited_regex to build_whitespace_split_regex c5976d2
Colton Myers basepi Use run_all so we get more debug output, Fix #5029 f7fc5de
Thomas S Hatch thatch45 Fix #5010 7e59870
Thomas S Hatch thatch45 Fix #4669 231a0d1
David Boucha UtahDave freeze numbers f5bf3ba
Colton Myers basepi Sync the grains on grains.setval, Fix #5009 fc575b6
Colton Myers basepi Remove extra .splitlines(), Fix #4720 655b4b8
Colton Myers basepi Fix some pep8 607a589
Colton Myers basepi Make npm.uninstall and npm.removed more consistent, Fix #4674 b01c52e
David Boucha UtahDave return proper var
Colton Myers basepi Fix disk.usage for Darwin (osx), Fix #4958 454d89d
Colton Myers basepi Do some logic reordering and check for multi-word filesystems c1b576a
Chris Rebert cvrebert fix #4682 d6e8572
Corey Quinn Added dctrl-tools to debian packaging 9da1247
Chris Rebert cvrebert Fix #4939 c611280
Chris Rebert cvrebert capitalize Linux in comments/docs f885e7c
Pedro Algarvio s0undt3ch Import missing lib. Double to single quotes. Minor formatting change. 4f9be59
Colton Myers basepi Move max open files to info log, not warning 0e88603
Erik Johnson terminalmage add missing module import 0e899e3
Colton Myers basepi Explain how to do a leading `not` in compound matcher 275b70e
Niels Abspoel aboe76 Fixed multiple pep8 errors in salt-run code
fixed E302 expected 2 blank lines before def ()
fixed E123 closing brackets
fixed W291 trailing whitespace
fixed E128 line under-indented for visual indent

after refactor: no errors
after refacter:pep8 errors left: E501 line too long (102 > 79 characters) E501 line too long (80 > 79 characters) E501 line too long (83 > 79 characters) E501 line too long (96 > 79 characters)
Corey Quinn QuinnyPig dctrl-tools belongs in depends, not build-depends 7e0ed19
Thomas S Hatch thatch45 Fix #5052 16ce7c1
Thomas S Hatch thatch45 Start on #5035, still needs support for init.sls a093a92
Chris Rebert cvrebert rename to avoid shadowing 'range' built-in 82f39d1
Chris Rebert cvrebert rename to avoid shadowing built-in type 'type' 05e9e98
Chris Rebert cvrebert rename to avoid shadowing built-in type 'file' 6caa99c
Chris Rebert cvrebert simplify by using list comprehensions 48595f4
David Boucha UtahDave Remove redundant os check
Fixes #5045
Chris Rebert cvrebert package -> pkg, to avoid shadowing func of same name baeea6d
Chris Rebert cvrebert npm state: installed -> installed_pkgs, to avoid shadowing func of sa…
…me name
Chris Rebert cvrebert extfs module: blocks -> free_blocks, to avoid shadowing same-named func 016a87e
Chris Rebert cvrebert bluez mod: address -> addr, to avoid shadowing same-named func 7395376
Chris Rebert cvrebert auth.ldap: avoid shadowing builtins: dict->variables, filter->filter_ 022e43f
Chris Rebert cvrebert debconfmod: type -> type_, to avoid shadowing built-in type 'type' d0332c0
Chris Rebert cvrebert pydsl: id -> state_id, to avoid shadowing the built-in func 2986488
Chris Rebert cvrebert git mod: status -> state_by_file, to avoid shadowing same-named func cbf2054
Chris Rebert cvrebert win_service mod: status -> statuses, to avoid shadowing same-named func 2faeb90
Thomas S Hatch thatch45 Add example to regen keys 0be4a5d
Chris Rebert cvrebert grub_legacy: refactor to avoid shadowing conf() function 125d0ab
Chris Rebert cvrebert network mod: rename subnets -> subnetworks, to avoid shadowing func 05b50ee
Chris Rebert cvrebert file state: refactor to avoid shadowing comment() func; optimization too 1c49a42
Chris Rebert cvrebert file state: exists -> extant, to avoid shadowing same-named func c9a614f
Chris Rebert cvrebert file mod: rm unnecessary temp var to avoid shadowing outer mkdir() func 548c67e
Thomas S Hatch thatch45 Fix #4955 bb7e769
Thomas S Hatch thatch45 fix #4985 6b63e72
Pedro Algarvio s0undt3ch Handle lower msgpack versions which can't handle `OrderedDict`'s. Fixes

Dictionary subclasses were only added to msgpack after 0.2.0(inclusive).
Since `isinstance(OrderedDict(), dict)` returns true, of course, msgpack's custom type handling cannot be used.
The solution is to iterate through the data and convert `OrderedDict`'s to `dict`'s since that's what msgpack also does.
For now, the iteration is a top level one, ie, only first child descendants are evaluated. We won't go deeper unless we get the same failure a little deeper in the nested data.
shintonik shintonik bugfix: NPM may return JSON arrays which were not supported by the NP…
…M module and the NPM state.
Thomas S Hatch thatch45 Fix #5092 41678ca
Thomas S Hatch thatch45 Fallback to base per #5092 ec2475d
Colton Myers basepi Use the 'rev' arg in git.rebase, Fix #4767 2567ac8
Colton Myers basepi Add to doc examples for remote rebases 504d2b7
Chris Rebert cvrebert reg mod: add space after comma to satisfy pylint e566f7c
Chris Rebert cvrebert actually stop shadowing e372de1
Commits on May 21, 2013
Chris Rebert cvrebert runners.manage: rm unused import of shutil a079c7f
Thomas S Hatch thatch45 Add docstring per #5105 ae29e51
Thomas S Hatch thatch45 Add docstring per #5105 5a4285d
Thomas S Hatch thatch45 Fix #5105 288a43e
Matthieu Guegan mguegan grains/core : fix fqdn / domain return on SunOS systems
getfqdn() on Solaris platforms returns the unqualified hostname. In
that case, using gethostname() could be a solution.

Tested on SmartOS / Solaris 11
Thomas S Hatch thatch45 Single quotes 7909426
Tim Laszlo timl yumpkg5: Comment indicates this is used on python >= 2.6 instead of <…
… 2.6
kt97679 kt97679 /usr/bin/env python -> /usr/bin/python in scripts 04b8812
Matthieu Guegan mguegan grains/core : add useful information from SmartOS zone
This patch is intended for SmartOS users who are using OS
virtualization. You can now have access to :

- pkgsrcversion

- imageversion
Chris Rebert cvrebert have pylint ignore __env__ too 6853da2
Chris Rebert cvrebert fix spelling 2b5691b
Chris Rebert cvrebert include_config -> configuration, to avoid shadowing same-named func b8fc0af
Chris Rebert cvrebert rm unused salt.utils import from openbsdpkg module 98cebf8
Chris Rebert cvrebert State.order_chunks(): sort only once instead of twice 48506a5
Chris Rebert cvrebert safe_walk: stat -> status, to avoid shadowing the imported 'stat' module b23bb60
Chris Rebert cvrebert file state: comment -> comment_, to avoid shadowing outer func bf38f75
Chris Rebert cvrebert rename running -> runnings to avoid shadowing; use comprehension e1a27be
Chris Rebert cvrebert top -> top_, to avoid shadowing the func a30ed4a
Chris Rebert cvrebert high -> high_, to avoid shadowing the func 56d50c0
Chris Rebert cvrebert improve var naming in socket_util.IPv4Address init 801ed16
David Boucha UtahDave add try/except when getting process owner 2777b4f
David Boucha UtahDave Fix pkg.remove
Matthieu Guegan mguegan grains/core : add hw_data support for SunOS kernel type
SmartOS / Solaris systems can now have access to useful hardware
information (from smbios command).

Note : it only works on systems which export SMBIOS table (x86
platforms, Global Zone in SmartOS...). It DOESN'T work on SPARC
platform and inside a SmartOS zone (ie. SmartMachine)
Bruno Clermont bclermont fix git.remote_set usage 0aeb7ea
Thomas S Hatch thatch45 meow?
iMil iMilnb Added NetBSD support to _hw_data b4e781c
Thomas S Hatch thatch45 Can't serialize pydev/stateconf, start on #5055 473c515
Thomas S Hatch thatch45 Fix #5055 68ed86a
Thomas S Hatch thatch45 Add pydsl runtime test per #5055 9f54be3
Thomas S Hatch thatch45 fix pydsl test f730c7a
Jason R. McNeil jasonrm Fix minor file.recurse doc error
This minor doc error got me stuck for a few more minutes than it should have, better fix it.
David Boucha UtahDave don't import get_user. Defined locally 94098ef
Ulrich Dangel mrud Fix spelling errors reported by lintian 3143c62
Anthony agjohnson Changes to NetBSD groupadd/useradd
* Add NetBSD to groupadd/useradd
* Add NetBSD exclusion to shadow
* Skip useradd system flag for NetBSD
Thomas S Hatch thatch45 Clean up stray critical logs 9b72656
Thomas S Hatch thatch45 Add get_cache_returns to localclient b7490c5
Thomas S Hatch thatch45 Execute a final check on the job cache with publish system
This is to double check that nothing from the event bus way missed
Chris Rebert cvrebert solr mod: fix apparent incomplete var renaming: name->core
discovered via pylint W0631
Chris Rebert cvrebert fix other instance in this file e6cb4dd
Chris Rebert cvrebert grains.core.saltpath: path -> salt_path, to avoid shadowing same-name…
…d func
Chris Rebert cvrebert loader: rename vars to avoid shadowing grains() func 1c2c476
Colton Myers basepi Don't memoize user.list_groups, Fix #5154 2cb0656
Colton Myers basepi Log the exception rather than ignoring it, Fix #5160 736d5f2
Erik Johnson terminalmage zypper: fix pkg.latest_version
latest_version was using list_upgrades(), which in turn ran
'zypper list-updates'. This, however, does not give information for
packages which are available but are not presently installed. Changed
latest_version so that it parses the output from 'zypper info'.

Fixes #5166.
David Boucha UtahDave Some small doc improvements for Windows Repo page acdae64
Tim Laszlo timl Replace human_name with humanname.
The documentation indicates
human_name should hold to a human readble name for the repository.
The code is looking for humanname.
Tim Laszlo timl pkrgrepo verification fails
When verifying pakages, skip the repo keyword and ensure the
value is a string.  Always fails for gpgcheck with yum.
Mina Naguib jinja2 templates: Enable the 'do' and 'loopcontrols' extensions
See for their documentation
Pedro Algarvio s0undt3ch Don't try to get the `_fmt` attribute if there's no formatter. Refs s… e446f79
Colton Myers basepi Make explicit context overwrite kwargs for templating, Fix #5161 bb7b36c
Commits on May 22, 2013
Colton Myers basepi Fix syntax error in jinja context examples
Bad indentation meant it would pass in the pieces of context as part of
the **kwargs, rather than as part of the context kwarg.
Colton Myers basepi Remove retcode arg from cmd._run, Fix #5112
Checked for external uses, there are none.  Really not sure what it was
gaining us in the first place, but it's been out of use since the fix
for #2640.
Colton Myers basepi Update up to date with develop branch ce9b6f0
David Boucha UtahDave Make pkg state work with Windows packages 1b306df
David Boucha UtahDave add missing globals 8c15c27
Colton Myers basepi Use .next() instead of dummy loop, Fix #5120 220b207
Colton Myers basepi Fix my stupidity (leftover `:`) b7b8574
Colton Myers basepi Improve python3 compatibility with next() built-in 9c6dcd7
sib sibsibsib fixed: TypeError in pkg._find_install_targets when version is None 4dd8a9f
Pedro Algarvio s0undt3ch Work around `__file__` `NameError` thrown by `bbfreeze`. Fixes #5172. bdfe22e
Pedro Algarvio s0undt3ch Add `yum` to freezer includes if we can actually freeze it, ie, is it…
… available?
Colton Myers basepi Update salt.states.pkg to match develop e1e9843
Commits on May 25, 2013
Thomas S Hatch thatch45 Fix bug in minion_publish repair 6d60a9d
David Boucha UtahDave Get proper Windows full pkg name 8b7d1ba
sib sibsibsib fixed: TypeError in pkg._find_install_targets when version is None 32c8178
Colton Myers basepi Improve python3 compatibility with next() built-in 6e72689
Geoff Garside geoffgarside Ensure mount options in remount come before special + node.
Fixes calls to mount where an fstype is specified.
rballestrini Resolve bug where states/ _run_check() function was mutating cm…
…d_kwargs (using pop function) which caused subsequent cmd's to runas/user = None (default user) instead of specified user.

unless and onlyif break runas user cmd.[run, script, call]

We will supply a patch to resolve
rballestrini Cleaned up _run_checks()'s docstring and return dictionaries comments
Colton Myers basepi Output an error if no matching sls file is found, Fix #5048 5cdda01
Colton Myers basepi Fix some pep8 5cd32ef
Colton Myers basepi Make the error message more readable 6ba2e21
Timothy Messier shadowfax-chc Fixed issue with npm.install for npm>=1.2.21. Closes #5189 33cd5e4
Robert James Hernandez l2ol33rt Added argument passing to cmd.script state 866980b
Timothy Messier shadowfax-chc Fixed shadowing built-in in mdadm module. Ref #5085 dcfe8b2
Pedro Algarvio s0undt3ch Replace `rpmUtils.arch.getBaseArch()` with `rpmUtils.arch.getCanonArc…

According to the `rpmUtils.arch` source code, when no argument is passed to `rpmUtils.arch.getBaseArch()`, the result should be the same as `rpmUtils.arch.getCanonArch()`. However, in CentOS 6.4 with yum-3.2.29-40.el6.centos.noarch:

>>> import rpmUtils.arch
>>> rpmUtils.arch.getBaseArch()
>>> rpmUtils.arch.getBaseArch(None)
>>> rpmUtils.arch.getCanonArch()

This little thing made the `pkg.latest` state fail, and also the `pkg.latest_version` module function.
faust faust Added correct path for Gentoo iptables config file.
Gentoo also have a service to enforce iptables rules, maybe you can consider to handle it in some way.
I would have done that by myself, but this module looks to be still under heavy development and I don't want to create new issues.
faust faust A little fix in "file state" documentation 84369b8
Colton Myers basepi Remove redundant fnmatch call 1ef0b6e
David Boucha UtahDave Add docstring 589042f
David Boucha UtahDave Set default broadcast to empty string 8c786ed
Chris Rebert cvrebert fix punctuation typo
Chris Rebert cvrebert cmd state: add space after comma
************* Module salt.states.cmd
C0324:616,8:script: Comma not followed by a space
        cmd_kwargs.update({'args': name.split(' ',1)[1]})
Thomas S Hatch thatch45 Resolve remaining changes from 84dd900 b59f398
Chris Rebert cvrebert pkg state: fix pylint W0604
************* Module salt.states.pkg
W0604: 48,4: Using the global statement at the module level
Thomas S Hatch thatch45 Clean up subset merge c36caef
David Boucha UtahDave Don't use a bare exception 27e9239
Colton Myers basepi Add line number to Jinja errors, Fix #4966
Thanks to @Mrten to figuring this one out.  =)
Colton Myers basepi Clean up the error message 8473f46
Jakub Vysoký kvbik be consistent about .override use
disabling of service is correct, but checking whether
it is disabled is not

upstart service is disabled by creating {service-name}.override file
and adding a 'manual' stanza there [1]

Colton Myers basepi Add new ref logic to _get_ref as well 6518d86
Colton Myers basepi Parse kwargs with YAML, Fix #5224
Thomas S Hatch thatch45 Revert "Handle args that were previously parsed into lists, Fix #5031"
This reverts commit 773fda0.
Thomas S Hatch thatch45 All kwvals are parsed before reaching functions now
Fix test failures from #5031 773fda0
Thomas S Hatch thatch45 Revert "add try/except when getting process owner"
This reverts commit 4e71d74.
Commits on May 28, 2013
Geoff Garside geoffgarside Fix command on FreeBSD.
Uses `mount -p` on FreeBSD as neither of the `/proc/self` files
currently used to determine active mounts exist on FreeBSD systems.
Geoff Garside geoffgarside Ensure mount options come before special and node.
Fixes calls to mount where an fstype is specified.
Valentin Bud valentinbud Update GitFS Backend Walkthrough to include GitFS over SSH
A small description on how to configure GitFS over SSH transport.
Colton Myers basepi Allow slashes in gitfs envs, Fix #5007 ce73a98
David Boucha UtahDave Add docstring to interface() b1493c8
Colton Myers basepi Use yamlify_arg() in more places e0f32d3
David Boucha UtahDave Fix failing test for checking get_owner d618c33
David Boucha UtahDave Set vars to none instead of empty string 58e6651
Chris Rebert cvrebert fix ye olde English typoe 659c911
Thomas S Hatch thatch45 Catch case where format_call stack traces and the trace is safe 092177b
Matthieu Guegan mguegan module/timezone : add Solaris family support
This commit will add the support of TZ for Solaris platforms.

Tested with SmartOS
Matthieu Guegan mguegan Pull #5264 : get rid of re.match as @cvrebert pointed out d73595b
Pedro Algarvio s0undt3ch Typo. ce57c5d
Thomas S Hatch thatch45 Fix #5218 d0949f8
mprymek mprymek Import salt.utils.winapi d902b9a
Colton Myers basepi Import both for completeness
Importing `salt.util.winapi` does import `salt.util` as well.  However,
having both explicitly shows that both are being used, and matches the
pattern we use elsewhere.  Additionally, as far as I know it doesn't
have any real performance costs, as it doesn't reimport `salt.utils` if
it's already loaded.
Thomas S Hatch thatch45 Fix for #4920, needs to confirm 1606c5c
Thomas S Hatch thatch45 Add vars reference document. Fix #5220 33235b6
Matthew Williams mgwilliams modules/ use qemu-img to detect image type; allow emulator ty…
…pe (e.g., kvm, qemu) to be passed as an arg to init
Pedro Algarvio s0undt3ch Only load module if windows required imports are available.
Seems the way to do it and also stops an import traceback to be logged on Linux when importing `salt.utils.winapi`.
Thomas S Hatch thatch45 Update the loop_interval to 1, we have to play around with this
Thomas S Hatch thatch45 Add loop_interval to minion config for tests a79a907
Thomas S Hatch thatch45 Don't pass jid in non-full return per #4402 8ac077b
Todd Johnson toddejohnson Fix xinetd service name to not have appended : in service name. dc527d8
Commits on May 29, 2013
Thomas S Hatch thatch45 Revert "Use yamlify_arg() in more places"
This reverts commit 663176a.
Thomas S Hatch thatch45 bump version to 0.15.2 35ab99e
Commits on May 31, 2013
Thomas S Hatch thatch45 make gem test ref non func alias b2b358c
Thomas S Hatch thatch45 Fix ref no non func alias in rvm test abfa301
Thomas S Hatch thatch45 Single quotes 486cfe1
Chris Rebert cvrebert network mod: "not X in Y" => "X not in Y" fd1bc0e
yinchuan yinchuan Node Groups: ',, or bl*.d…
…' not 'and'

use 'and' at this confuse me, and in the also use 'or'.
Thomas S Hatch thatch45 list_, not _list e96019e
Niels Abspoel aboe76 suse package updated to 0.15.2
added salt user for salt-master daemon process
Thomas S Hatch thatch45 Fix misleading documentation on the env option for
Fix #5275
Pedro Algarvio s0undt3ch We can't use `getCanonArch()` after all.
Under a Fedora 18 machine for which the `cpuarch` grain reports `x86_64`:

>>> import rpmUtils.arch
>>> rpmUtils.arch.getCanonArch()
>>> rpmUtils.arch.legitMultiArchesInSameLib()
['x86_64', 'amd64', 'ia32e']
>>> rpmUtils.arch.getBaseArch()

Under a CentOS 6.4 for which the `cpuarch` grain reports `i686`:
>>> import rpmUtils.arch
>>> rpmUtils.arch.getCanonArch()
>>> rpmUtils.arch.legitMultiArchesInSameLib()
>>> rpmUtils.arch.getBaseArch()

The only common recipe seems to be using `legitMultiArchesInSameLib()`
Colton Myers basepi Force autosign regex to match entire string, Fix #4851 bb59399
Thomas S Hatch thatch45 Use an alternative modules file on Arch
This fixes #5274 but more investegation wrt where this should
be and on what OSes/kernel versions needs investigation.
Thomas S Hatch thatch45 Add validation logs for the configs, fix #5271 f70985a
Thomas S Hatch thatch45 Allow custom grain modules to override values defined in core
Fix #5254
Thomas S Hatch thatch45 Only care about sudo origin if calling fully authenticated
This makes Salt only pass the sudo reference down in the event that
the user being sudoed to is considered by salt to be a fully
authentecated user, fix #5245
Thomas S Hatch thatch45 DOH! Fix #5281
I will scurry off to write more tests.....
Thomas S Hatch thatch45 Lower data sent with master_opts 611223b
Thomas S Hatch thatch45 Fix #5124 ef5becd
Thomas S Hatch thatch45 Last one! Fix #5085 e46e99a
Thomas S Hatch thatch45 Re fix #1264 08979f9
Thomas S Hatch thatch45 Fix #5191 c629d0a
Chris Rebert cvrebert rm duplicate entriesin dict literal, except for loop_interval
Because the 2 entries for loop_interval disagree on whether it's a float or an int.
Thomas S Hatch thatch45 Use detect_kwargs in runner, fix #5259 8a8fc59
Thomas S Hatch thatch45 Its a float 7eadc0d
Pedro Algarvio s0undt3ch Switched to a fixed and more complete `OrderedDict` recipe. Fixes #4912. 6716731
Pedro Algarvio s0undt3ch Disable the methods which require `_abcoll`.
Let's hope those methods are not used.
yinchuan yinchuan modify a sentence for more accurate cce742f
Zach Marano zmarano Fix a bug in linux GPU vendor searches. With Intel integrated graphic…
…s, this function would return 'ati' as the vendor name because 'ati' was in the string Intel Corporation. Change the search to look at a list of strings to match a vendor name. This should work with any of the known vendors at this point in time.
Colton Myers basepi Add refresh arg to group.getent() 770b5d7
Colton Myers basepi Add refresh option to the other group.getent() instances ec8ac75
Colton Myers basepi Enumerate removed groups in user.absent state, Fix #5310 e6a6869
Colton Myers basepi Access the group data correctly (it was reformatted) aeb6a67
Colton Myers basepi Actually format the string so it's useful 6c7fe74
halfss halfss fixed bug: schedule's return's log is wrong order
[INFO    ] Job local_return using invalid returner: state.highstate Ignoring.

[INFO    ] Job state.highstate using invalid returner: local_return Ignoring.
David Gil dgilm fix fail invoking salt as restricted user 4981fa2
David Gil dgilm filter outputs begining with '***' (lshell errors) 2a7d4f4
David Gil dgilm use regex in order to match lspci output format 6359115
Chris Rebert cvrebert Say it with me now: Use raw strings for regexes! 87f50dc
Chris Rebert cvrebert runner: rm unused import of `inspect` std lib module 7545e9d
Commits on Jun 01, 2013
Thomas S Hatch thatch45 func_alias changes were not merged back to 0.15 24879cf
David Boucha UtahDave Add _is_bin to namespaced functions
Fixes #5336
Chris Rebert cvrebert Add explanatory comment based on #5235 88eef15
Chris Rebert cvrebert clarify that states.cmd.wait{,_call,_script} ignoring their args is O…
…K; see #5123
Chris Rebert cvrebert Correct arg ordering in docstring afb3120
David Boucha UtahDave Add try/except to not fail on missing info
Fixes #5334
David Boucha UtahDave fix NoneType error
Check to make sure user and domain aren't None
David Boucha UtahDave bump windows installer version number.
yinchuan yinchuan add resource limits in salt-master.upstart to correct issuse #5323 a3c96f6
jdelic Fix modules.useradd so that `home` isn't overloaded with multiple mea…

and then allow states.user to support `createhome` as an alternative to
the multiple meanings of `home`.

This also fixes the edge-case that useradd would under specific
circumstances create a home directory called "True".
Thomas S Hatch thatch45 Fix pillar_refresh error
The cherry-pick was not clean to fix this. but basically after
refreshing the pillarthe new pillar needs to be loaded into the