Commit Graph

76314 Commits

Author SHA1 Message Date
Alexandru Bleotu
80baf38ee6 Added tests for new serialization code 2016-11-29 08:01:41 -05:00
Alexandru Bleotu
c30e6a98bf Update DefinitionsSchema serialization code
- correctly handle serialization of container item attributes
  (OneOfItem, ArrayItem, DictItem)
2016-11-29 08:01:41 -05:00
Alexandru Bleotu
eb8dfb9366 Added class SchemaItem attributes; removed redundant _complex_attributes 2016-11-29 07:57:10 -05:00
Alexandru Bleotu
85c9d38564 Add required attribute to OneOfItem constructor 2016-11-29 07:13:03 -05:00
Alexandru Bleotu
07979897b6 Added tests for InvalidArgument fault handling in utils.vmware.wait_for_task 2016-11-29 05:23:07 -05:00
Alexandru Bleotu
a6aab8c657 Handled InvalidArgument fault in utils.vmware.wait_for_task 2016-11-29 05:22:43 -05: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
66ee3b32b7 Remove unused import 2016-11-28 15:25:12 -07:00
twangboy
c90c2e3d45 Add functions from network.py to win_network.py 2016-11-28 15:04:50 -07:00
Bo Maryniuk
e67706bd29 Document the behaviour. 2016-11-28 22:22:38 +01:00
Bo Maryniuk
1970814111 Prevent crash during externally changed archive permissions 2016-11-28 22:20:51 +01:00
Mike Place
e539a94a56 Merge pull request #37884 from isbm/isbm-zypper-gpgkey-pkg-filter
Do not include "gpg-pubkey" packages, filtering by their name
2016-11-28 14:11:37 -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
eb3d81a1de Merge pull request #37882 from attiasr/fix_missing_tags
multiple issues in boto_rds state and module
2016-11-28 14:09:11 -07:00
Bo Maryniuk
f9ec5d68af Use six instead of builtins 2016-11-28 22:04:53 +01: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
Bo Maryniuk
203dfcb238 Use American spelling instead 2016-11-28 22:02:44 +01: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
Nicole Thomas
8f986b28dc Remove release candidate doc ref from 2016.11.0 release notes (#37931) 2016-11-28 13:49:28 -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
Thomas S Hatch
3d2dabc7b7 Merge pull request #37930 from cachedout/fix_comp
Remove dictionary comprehension in netusers
2016-11-28 13:27:06 -07:00
Mike Place
670e83200b
Remove dictionary comprehension in netusers 2016-11-28 13:24:44 -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
Nicole Thomas
0f8b187d15 Merge pull request #37923 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2016-11-28 12:55:03 -07:00
Thomas S Hatch
14271156f6 Add a release notes reference to the docker-sls tutorial (#37927) 2016-11-28 12:54:17 -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
da7f5518eb Don't let 2016.3 doc config changes overwrite the 2016.11 changes 2016-11-28 11:09:35 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
2016-11-28 11:08:19 -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
c35ba1f390 Merge pull request #37916 from rallytime/doc-update-2016.3
[2016.3] Update version numbers in doc config for 2016.11.0 release
2016-11-28 10:09:08 -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
rallytime
bd40592289 [2016.3] Update version numbers in doc config for 2016.11.0 release 2016-11-28 09:18:38 -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
73b3c5fa1a Add newline
Needed to pass lint test
2016-11-28 07:11:14 -07:00
Mike Place
e13a2488c8 Merge pull request #37785 from Cloudtek/ddns-respect-trailing-dot
respect trailing dot in ddns name parameter
2016-11-28 16:02:10 +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
c03b389422 Merge pull request #37895 from fj40crawler/fix-augeas-return-for-test
Change return value for salt/states/augeas.py to be True instead of N…
2016-11-28 15:49:27 +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
Mike Place
fdbc31e8d8 Merge pull request #37907 from Talkless/patch-2
Fix server trust in test run of svn.latest
2016-11-28 15:47:39 +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