Commit Graph

71908 Commits

Author SHA1 Message Date
Jeffrey 'jf' Lim
17a230a2e5 Tighten up test_list_modules_with_arg: should include "assertNotIn" too 2016-07-31 02:16:45 +08:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons
Add check for admin on Windows, gated
2016-07-29 10:39:28 -06:00
Mike Place
b0b2eabda9 Merge pull request #35012 from lubyou/let-win_dacl-accept-sids
Accept both user accounts and SID's in the win_dacl module.
2016-07-29 10:33:38 -06:00
Mike Place
316ac62463 Merge pull request #35031 from bodhi-space/infra1589
INFRA-1589 - add several tagging related functions to boto_ec2 exec and state modules
2016-07-29 10:07:06 -06:00
Mike Place
bd5e2a3ed3 Merge pull request #35033 from UtahDave/fix_win_cpu_model
Fix cpu_model grain on Windows to actual CPU model
2016-07-29 10:06:25 -06:00
Mike Place
b057a57017 Merge pull request #35036 from techhat/fallback
Catch errors when attempting fallback
2016-07-29 09:13:21 -06:00
Mike Place
9f91c0d954 Merge pull request #35047 from bodhi-space/elasticache-bits
Add a couple of functions to boto_elasticache, and fix a bug I introduced awhile back
2016-07-29 08:53:03 -06:00
Johannes Scholz
d1873075e0 make lint happy 2016-07-29 10:37:37 +02:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart
Introduce a template system for extending SaltStack open
2016-07-28 22:38:10 -06:00
Anthony Shaw
e32ba10365
add 2.6 support 2016-07-29 10:00:28 +10:00
Tom Williams
3d9d137e98 Add boto_elasticache.{get_all,list}_cache_subnet_groups() and fix a bug I introduced 2016-07-28 19:40:34 -04:00
Anthony Shaw
39159cc6cb
add the salt deserializer 2016-07-29 09:29:17 +10:00
Tom Williams
f348963412 INFRA-1589 - oops, forgot and used dictionary comprehensions :) 2016-07-28 19:18:14 -04:00
David Boucha
2fe747c05c add release note about the cpu_model grain change 2016-07-28 15:35:55 -06:00
David Boucha
7258847f92 Fix cpu_model grain on Windows to actual CPU model 2016-07-28 15:35:55 -06:00
Mike Place
9a66dae07f Merge pull request #34845 from vladislav-jomedia/add-tmp_ext-to-file_managed
added extention for tmp file when using check_cmd in file.managed state
2016-07-28 14:32:12 -06:00
Mike Place
3784464077 Merge pull request #34814 from vutny/smtp-return-multiple-recipients
smtp_return: allow specifying multiple recipients
2016-07-28 14:30:42 -06:00
Joseph Hall
9d216529ba Change warn log to info 2016-07-28 14:10:56 -06:00
Mike Place
404833e51b Merge pull request #34969 from fdamstra/Add_multi_event_return
Adds support for multiple server-side event_returners.
2016-07-28 13:39:52 -06:00
Mike Place
0fea848878 Merge pull request #35022 from rallytime/cleanup-34914
Add versionadded for new cache_valid_time option in aptpkg
2016-07-28 13:39:02 -06:00
Mike Place
66127f277b Merge pull request #35005 from twangboy/int_tests_state
Fix state execution module integration tests for Windows
2016-07-28 13:37:54 -06:00
Mike Place
9adfa4a651 Merge pull request #34972 from twangboy/int_tests_hosts
Fix hosts integration tests for Windows
2016-07-28 13:36:11 -06:00
Joseph Hall
3df8183af6 Catch errors when attempting fallback 2016-07-28 13:03:31 -06:00
Mike Place
09d8a37110 Merge pull request #35030 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-07-28 12:38:30 -06:00
Mike Place
22a9237e1e Merge pull request #35025 from dmacvicar/apt_crash
do not crash on "make" package description.
2016-07-28 11:55:41 -06:00
Tom Williams
920a60d494 INFRA-1589 - add several tagging related functions to boto_ec2 exec and state modules 2016-07-28 13:50:36 -04:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/utils/schedule.py
2016-07-28 11:08:14 -06:00
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00
twangboy
5ca2f15664 Fix test_issue_1896... for Linux 2016-07-28 09:33:23 -07:00
Erik Johnson
3520757845 Don't add '.' to strerror when passed string ends in ? or ! (#35021)
* Don't add '.' to strerror when passed string ends in ? or !

This keeps the formatted exception string from needlessly containing a
'.' if the sentence ended in a different punctuation mark.

* Better handle cases in which exception was raised w/empty message
2016-07-28 10:21:01 -06:00
rallytime
696583bd27 Add versionadded for new cache_valid_time option in aptpkg
And some various doc cleanup from the new docs.
2016-07-28 09:35:37 -06:00
Duncan Mac-Vicar P
1287822b5b do not crash on "make" package description.
Package info is retrieved calling dpkg using a custom format/separator. However the code that parses the output for some reason does not use THAT separator (six '-' or '='), but a regexp with a different meaning (three or more '-' or '=') that chokes on the description of make (https://packages.debian.org/jessie/make) which contains three '-''s.
2016-07-28 17:33:23 +02:00
onorua
b09aacf185 Introduce cache_valid_time parameter (#34914)
this should speedup situation when several states need
refresh_db: True

In case you have several states like this, apt-get update will be
called on every step refresh is set.

Proposed solution will skip refresh in case cache_valid_time is set
unless apt-get update preceded more than cache_valid_time seconds ago.
2016-07-28 09:24:17 -06:00
Eric Radman
42222b06fe Remove stray debug print statements (#35019)
This cleans up the unit test output a bit, mostly leaving deprecation warnings.
2016-07-28 09:17:27 -06:00
Takuya Nishigori
b0a6fc794a Fix docstring for code-block of rst (#35011) 2016-07-28 08:40:49 -06:00
Nicole Thomas
812916b45f Fix rabbitmq_user state test to check for correct string (#35007)
This test was failing when I ran it locally - I'm not sure why the
error isn't showing up in Jenkins, but I double checked the string
in the state and there should be single-quotes around the user name.
2016-07-28 08:37:37 -06:00
Johannes Scholz
5bda18c57c Accept both user accounts and SID's.
Accounts with well known SID's (administrator, everyone, etc)
are localised on non English Windows versions ("everyone" on
English systems is named "Jeder" on German systems, and
"toute le monde" on French systems) which is why one would use
the SID's of the accounts instead, as the well known SID's are
the same across all systems.
https://support.microsoft.com/en-us/kb/243330
2016-07-28 11:31:24 +02:00
Denys Havrysh
aa4ed73913 smtp_return: fix user credentials leak in the debug log 2016-07-28 11:13:36 +03:00
Anthony Shaw
929faeb436
add email and name to test templates, removed typo in module_test template 2016-07-28 13:42:36 +10:00
Anthony Shaw
87954a2baf
add newline to test 2016-07-28 12:44:01 +10:00
Anthony Shaw
bc528eb4d0
completed test to check files, names and contents 2016-07-28 11:52:16 +10:00
Anthony Shaw
84d8fe0af4
don't add the test template to the list of options, don't copy template.yml to target 2016-07-28 11:47:48 +10:00
Anthony Shaw
2db43f05fa
fix bug where template name provided on cli 2016-07-28 11:41:34 +10:00
Anthony Shaw
b7257baade
add test class 2016-07-28 11:41:15 +10:00
Anthony Shaw
d7d4066c46
return the path 2016-07-28 11:34:04 +10:00
Anthony Shaw
5b2a97e22b
added docs 2016-07-28 11:33:42 +10:00
Anthony Shaw
d99b21c067
allow the template to add additional questions to the context and templatise the defaults 2016-07-28 09:55:54 +10:00
Anthony Shaw
6c7249dd9a
add next version class method to salt.version 2016-07-28 09:39:56 +10:00
Anthony Shaw
01bbe281a2
fixes based on @s0undt3ch feedback 2016-07-28 09:25:58 +10:00
Anthony Shaw
1280940079
linting fixes 2016-07-28 09:13:22 +10:00