Commit Graph

76079 Commits

Author SHA1 Message Date
Erik Johnson
a74fc5bd47 Add expr_form deprecation to Nitrogen release notes 2016-11-30 11:57:40 -06:00
Erik Johnson
c3e85e9967 Add absolute_import to please pylint 2016-11-29 20:37:47 -06:00
Erik Johnson
26600bcd0d Forgot a word in docs update 2016-11-29 15:52:04 -06:00
Erik Johnson
f7acb34248 Deprecate expr_form argument in the LocalClient
The published commands and the events all use tgt_type, expr_form is
only used in the LocalClient, which has been confusing to many users.
This puts expr_form on a deprecation path, allowing it to continue to be
supported while tgt_type becomes the new official argument name.
2016-11-29 14:03:34 -06:00
Mike Place
c25a306759 Merge pull request #37647 from americanexpress/cron-non-root
Revising cron for OS agnostic support of cron when running non-root
2016-11-29 07:33:48 -07:00
Mike Place
3277e63556 Merge pull request #37801 from cloudflare/MORE-FILTERS
More Jinja IP filters
2016-11-28 15:50:20 -07:00
Mike Place
76658631f9 Merge pull request #37904 from terminalmage/issue37698
Add states to manage systemd masking
2016-11-28 15:46:06 -07:00
Mike Place
c3bf3311e9 Merge pull request #37743 from discountbin/develop
Adding check for ignore_if_missing param when calling _check_file.
2016-11-28 15:40:02 -07:00
Mike Place
eb7b1e8a9c Merge pull request #37833 from vodik/jenkins-run
Add jenkins.run
2016-11-28 14:11:05 -07:00
Mike Place
9cab761320 Merge pull request #37909 from thusoy/invalid-timezone
Throw error when setting invalid timezone
2016-11-28 14:04:35 -07:00
Mike Place
a3d10b986b Merge pull request #37908 from gtmanfred/stalekey
variable is not always set for stalekey engine
2016-11-28 13:52:34 -07:00
Mike Place
754f6deb1a Merge pull request #37910 from m03/fix-37897-pkg-refresh_db
Fix for #37897 aptpkg.refresh_db inaccurate results
2016-11-28 13:48:51 -07:00
Mike Place
44306dd8a5 Merge pull request #37913 from gtmanfred/develop
Add ircbot engine for sending events to the reactor
2016-11-28 13:38:11 -07:00
Mike Place
ac8b18570c Merge pull request #37920 from cro/nohostname_stacktrace
Prevent FreeBSD minion from stacktracing on start if hostname not configured
2016-11-28 13:10:37 -07:00
Daniel Wallace
4d9722fb45 Add ircbot engine for sending events to the reactor
More to be added later like triggering commands from irc.
2016-11-28 13:12:42 -06:00
Nicole Thomas
6fd6c3516a Merge pull request #37919 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-11-28 12:05:39 -07:00
rallytime
b3340c3a73 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/conf.py
  - salt/config/__init__.py
  - salt/minion.py
2016-11-28 10:40:47 -07:00
C. R. Oldham
c4a9d95eba Prevent FreeBSD minion from stacktracing on start if hostname not configured 2016-11-28 10:26:22 -07:00
Tarjei Husøy
316d581354 Throw error when setting invalid timezone
Closes #37685.
2016-11-28 09:21:52 -08:00
Nicole Thomas
ab071f2636 [develop] Update version numbers in doc config for 2016.11.0 release (#37915) 2016-11-28 10:10:00 -07:00
Nicole Thomas
d204099db8 [2016.11] Update version numbers in doc config for 2016.11.0 release (#37917) 2016-11-28 10:08:52 -07:00
m03
2aeaf553c8 Add tests 2016-11-28 07:33:01 -08:00
m03
2dcd10f9ab Change fail_on_error to failhard for consistency 2016-11-28 06:46:09 -08:00
Mike Place
112bd61523 Merge pull request #37844 from terminalmage/issue37713-pt2
Fix empty __pillar__ dunder in develop
2016-11-28 16:17:33 +02:00
Mike Place
ee00592995 Merge pull request #37890 from bbinet/fix-genthin-six
Fix support for extra_mods='six' to add six module to a thin.tgz tarball
2016-11-28 15:53:06 +02:00
Mike Place
98edd97af2 Merge pull request #37903 from terminalmage/fix-warnings
Squelch warning for config value that can be either a dict or None
2016-11-28 15:48:38 +02:00
m03
2d0b3241bf Fix for #37897 aptpkg.refresh_db inaccurate results 2016-11-27 23:35:41 -08:00
Daniel Wallace
f77f66ec3d variable is not always set for stalekey engine 2016-11-27 15:31:55 -06:00
Mike Place
f912b8cd02 Merge pull request #37880 from alexbleotu/vmware_connection_common_functions-gh
Vmware connection common functions gh
2016-11-27 12:55:34 +02:00
Mike Place
468dea6c42 Merge pull request #37858 from cournape/installers/osx/support-maverick
FEAT: put back support for Maverick in OS X installer.
2016-11-27 12:54:05 +02:00
Mike Place
ab733dbf20 Merge pull request #37883 from s0undt3ch/develop
Make `terminate_process_pid` match latest form salt-testing.
2016-11-27 12:50:44 +02:00
Erik Johnson
efb4dc1001 Add states to manage systemd masking
This also changes how the systemd module handles masking, to accommodate
the fact that both indefinite and runtime masks can be set
simultaneously for the same service.
2016-11-27 01:06:33 -06:00
Erik Johnson
d8507384e2 Squelch warning for config value that can be either a dict or None 2016-11-26 16:31:40 -06:00
Erik Johnson
941fb8aa8b Merge pull request #37902 from gtmanfred/develop
use opts for metadata grains
2016-11-26 16:13:45 -06:00
Daniel Wallace
84c57ba761 use opts for metadata grains
I checked for them, but apparently we manually load the cmdmod stuff for
the core grains, so __salt__ is not loaded in metadata grain.  This just
means that this setting will have to be put in the minion config to
enable it.
2016-11-26 16:10:39 -06:00
Bruno Binet
7fceaa3476 Fix support for extra_mods='six' to add six module to a thin.tgz tarball
Without this patch, gen_thin will only include py2/salt/ext/six.py
but not py2/six.py (which may be required for other selected extra_mods
python modules)
2016-11-25 11:27:31 +01:00
David Cournapeau
dcc52ba08a BUG: fix copypasta in preinstall script. 2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa Revert "REF: use a variable to reference the pre/post install script output on OS X installer."
This reverts commit 7180e5ec21.
2016-11-24 14:52:03 +00:00
Mircea Ulinic
30b234f697
Import salt.utils.network 2016-11-24 14:08:35 +00:00
Pedro Algarvio
cbcd4ce123
Make terminate_process_pid match latest form salt-testing.
Namely https://github.com/saltstack/salt-testing/commit/094d00784812
2016-11-24 13:19:56 +00:00
Mircea Ulinic
8cdceebb34
Do not change previous behaviour 2016-11-24 12:35:18 +00:00
Alexandru Bleotu
39fe0b41b6 Added/updated tests for exception handling/get_root_folder change in utils.vmware.get_content 2016-11-24 05:53:51 -05:00
Mike Place
843ceac997 Merge pull request #37862 from cloudflare/LOAD-TPL-2016.11.1
[2016.11.1] Docstring fixes and new features for napalm_network
2016-11-24 03:00:38 +02:00
Mike Place
b9b57973b7 Merge pull request #37873 from twangboy/dsc_config_data
Dsc config data
2016-11-24 02:50:05 +02:00
Mike Place
8c20b62a2e Merge pull request #37874 from skizunov/develop2
Make build_pkg.bat work with Python 3.6/3.5/2.7
2016-11-24 02:49:20 +02:00
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871)
Found using

find . -name '*.rst' | xargs igor -R -r
2016-11-23 14:53:17 -07:00
Sergey Kizunov
334535bbd3 Make build_pkg.bat work with Python 3.6/3.5/2.7
Make `build_pkg.bat` and associated utility `portable.py`
compatible with Python 3.6, 3.5, and 2.7.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-11-23 14:24:55 -06:00
twangboy
fe3280b901 Change to config_name, add versionadded 2016-11-23 12:59:20 -07:00
twangboy
dba72d91ba Improve top documentation, standardize PowerShell 2016-11-23 12:50:00 -07:00
twangboy
fefd100d08 Additional docs formatting 2016-11-23 12:30:05 -07:00