Commit Graph

72203 Commits

Author SHA1 Message Date
Mike Place
87c2c96149 Merge pull request #35117 from rallytime/fix-zypper-regression
Don't completely skip UTF-8 check in Python3
2016-08-02 01:43:55 -06:00
Mike Place
10d7e1983a Merge pull request #35118 from terminalmage/issue34561
Add runner return data to job cache
2016-08-02 01:38:27 -06:00
kstreee
28f793caac Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-08-02 07:37:25 +00:00
Dmitry Kuzmenko
1d606e71c8 Fixed pylint error. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
42ef411c82 Updated salt-key test. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
b412e7814a Fixed salt-run integration tests. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
e419650bf1 Fixed salt-run outputter handling. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
0589ba8dce External auth support in salt-key. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
0cf7b3fbb9 External auth support in salt-run. 2016-08-02 10:01:01 +03:00
Ankit Agarwal
b8fcfea1d8 Fixing Lint Issues 2016-08-02 10:24:14 +05:30
Jeffrey 'jf' Lim
fe87097abd Round out (unit) test cases for sys.list_{functions,modules} 2016-08-02 12:32:54 +08:00
Jeffrey 'jf' Lim
75816fed93 Address linter issues for tests/unit/states/sysmod.py
("Exactly one space required after comma")
2016-08-02 12:09:57 +08:00
Jeffrey 'jf' Lim
8ab96d9b50 Remove integration tests for sys.list_{functions,modules} 2016-08-02 12:09:56 +08:00
Jeffrey 'jf' Lim
84a2512605 Throw in "sys." to the unit test for sys.list_functions too
(source: integration test for sys.list_functions)
2016-08-02 12:08:45 +08:00
Jeffrey 'jf' Lim
9df1c9933e Unit tests in place of integration tests for sys.list_{functions,modules}
NOTE that while I modify test_doc(), this is in order to make it pass.
test_doc() should not be seen as a proper test. Please do a better mock!
2016-08-02 12:08:45 +08:00
Erik Johnson
7af9d079f8 Save runner returns to the master job cache
... if runner_returns is set to True, of course.
2016-08-01 23:05:29 -05:00
Erik Johnson
369f5e208a Don't execute save_minions when target is an empty string 2016-08-01 23:04:48 -05:00
Erik Johnson
d54d14c6cf Add documentation for runner_returns config option 2016-08-01 23:04:05 -05:00
Erik Johnson
ce835da298 Add runner_returns to master config template 2016-08-01 23:00:07 -05:00
Erik Johnson
48ad9bb1fc Add new config param to gate runner returns 2016-08-01 22:59:41 -05:00
rallytime
e723110e0d Don't completely skip UTF-8 check in Python3 2016-08-01 19:03:25 -06:00
Mike Place
f1fbdf12de Merge pull request #35113 from kraney/boto_iot_thing_types
Support for aws iot 'thing type'
2016-08-01 18:33:06 -06:00
rallytime
d787140861 Make some adjustments after resolving merge conflict 2016-08-01 18:32:28 -06:00
Mike Place
81845ee31d Merge pull request #35114 from terminalmage/git_pillar-env-remap-docs
Add clarification docs on a common git_pillar misconfiguration
2016-08-01 18:30:47 -06:00
Mike Place
b5e556f3a3 Sync before state tests 2016-08-01 18:26:18 -06:00
rallytime
1f45d906c8 PY3: Fix byte string encoding issues when running shell.master int tests 2016-08-01 18:03:48 -06:00
rallytime
fbe87fbb4a PY3: Fix byte string encoding issues when running shell.proxy int tests 2016-08-01 18:03:48 -06:00
rallytime
f47e2f9399 PY3: Fix byte string encoding issues when running shell.minion int tests 2016-08-01 18:03:48 -06:00
Erik Johnson
5951554e9f Add clarification docs on a common git_pillar misconfiguration 2016-08-01 18:54:50 -05:00
Winston Liu
00e30057df added versionadded tags 2016-08-01 15:28:14 -07:00
Molly Kreis
60fc6e0e4b win_system: Fix system.set_system_date_time
win32api.SetLocalTime does not take a tuple of ints as its
input in Python 3, so system.set_system_date_time,
system.set_system_date, and system.set_system_time always
fail on Windows with Python 3. Calling directly into windll
not only succeeds but also works correctly in the case that
the timezone has been changed in the same python process.

Signed-off-by: Molly Kreis <molly.kreis@ni.com>
2016-08-01 17:27:24 -05:00
Mike Place
4587a3112f Merge pull request #35035 from plastikos/test-cli_exit_status
Test CLI exit status
2016-08-01 16:24:55 -06:00
Winston Liu
ef97c3f474 added unit tests for thing type present/absent states for boto_iot state functions. 2016-08-01 15:23:51 -07:00
Mike Place
efdc941058 Merge pull request #35091 from calve/patch-1
Fix salt.utils.boto assign_funcs documentation
2016-08-01 16:13:26 -06:00
Mike Place
ab4be69829 Merge pull request #35109 from thatch45/typos
Branding, it matters
2016-08-01 16:07:10 -06:00
Thomas S Hatch
307d5a17b2 Branding, it matters 2016-08-01 16:01:14 -06:00
Thomas S Hatch
9c1bb5c3ff Merge pull request #35062 from thatch45/develop
Initial Docker sls tutorial
2016-08-01 15:57:39 -06:00
Thomas S Hatch
d3a5e13ef3 like this you think? 2016-08-01 15:55:46 -06:00
Nicole Thomas
485dd07fe9 Merge pull request #35108 from dmacvicar/docker_base_image
this was supposed to be only temporary
2016-08-01 15:53:33 -06:00
Nicole Thomas
0b5a8370d5 Merge pull request #35106 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-08-01 15:51:26 -06:00
Winston Liu
56b41a5f07 additional unit test to cover newly introduce operations on thing type in boto_iot. 2016-08-01 14:46:56 -07:00
Erik Johnson
88a9fb1b31 Merge pull request #34768 from hrumph/bad-installed-state
Fixes #34767
2016-08-01 16:46:16 -05:00
Hengyang Hu
3a3b66e27d dont return job status back to master for master_alive and master_failback schedules 2016-08-01 14:45:20 -07:00
Thomas S Hatch
c7ea94ea01 it is no secret, I don't spell too well :) 2016-08-01 15:06:40 -06:00
Thomas S Hatch
64d6282135 SUSE, not Suse, not SuSE 2016-08-01 15:00:37 -06:00
Thomas S Hatch
b37e81a6cf clarify on image used 2016-08-01 14:44:32 -06:00
Duncan Mac-Vicar P
680dacafd3 this was supposed to be only temporary 2016-08-01 22:24:41 +02:00
Thomas S Hatch
823dc8d586 fix typo 2016-08-01 14:23:07 -06:00
twangboy
8eb97d08be Remove whitespace 2016-08-01 14:08:52 -06:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
2016-08-01 13:42:36 -06:00