Commit Graph

72439 Commits

Author SHA1 Message Date
rallytime
8083c97786 Remove the vsphere.rst docs for Carbon
Forgot to remove this file when removing the vsphere cloud driver
in #35248.
2016-08-10 16:16:29 -06:00
plastikos
82b4a51cb7 Correct comment to match c4395ae84e (#35354) 2016-08-10 13:50:26 -06:00
Mike Place
42d31e63f4 Merge pull request #35335 from cachedout/fixup_35151
Only decode in py3 for output
2016-08-10 23:59:18 +09:00
Mike Place
e79363498a Merge pull request #35338 from cachedout/fixup_35293
Refine arg conditioning for py2/py3 handling
2016-08-10 23:58:51 +09:00
Mike Place
41bd206608 Refine arg conditioning for py2/py3 handling
Refs #35293
2016-08-10 21:52:18 +09:00
Mike Place
4f87e5f9d2 Only decode in py3 for output
Refs #35151
2016-08-10 20:59:05 +09:00
Mike Place
2c6f785bfa Merge pull request #35283 from twangboy/windows_build_scripts
Add Salt-Master to Installer for Windows
2016-08-10 20:46:42 +09:00
Mike Place
08095474b2 Merge pull request #35285 from xbglowx/develop
Fixes #30577 - Add log_config option
2016-08-10 20:45:30 +09:00
Mike Place
4fb6436c4e Merge pull request #35305 from choffman/prepend_cn
Option to prepend the CN to the copypath filename
2016-08-10 20:41:50 +09:00
Mike Place
7f749c5158 Merge pull request #35308 from farcaller/fixtags
Actually fixed dockerng.list_tags
2016-08-10 20:40:23 +09:00
Mike Place
53be5ce3f2 Merge pull request #35312 from skizunov/develop2
Fix: `salt-key -f master.pub`
2016-08-10 20:37:27 +09:00
Mike Place
8ce8867c93 Merge pull request #35313 from rallytime/manage-deprecation
Change deprecation tag from Oxygen to Carbon
2016-08-10 20:36:26 +09:00
Mike Place
0167db1448 Merge pull request #35317 from rallytime/fileserver-runner-deprecations
Remove deprecated outputter kwarg from fileserver runner
2016-08-10 20:36:11 +09:00
Mike Place
27a2ce6c39 Merge pull request #35319 from rallytime/correct-versionadded
Use Carbon instead of Boron for new develop functions/args/kwargs
2016-08-10 20:34:15 +09:00
Mike Place
a77ba995cd Merge pull request #35332 from jf/fix_more_bugs_sys.list_runners,returners,renderers
Fix more bugs sys.list runners,returners,renderers
2016-08-10 20:29:41 +09:00
Jeffrey 'jf' Lim
639c193f83 Swop if-else logic around for better readability 2016-08-10 16:51:33 +08:00
Jeffrey 'jf' Lim
b425036503 Some coding niceties 2016-08-10 16:32:59 +08:00
Jeffrey 'jf' Lim
bb51d6aa82 Pylint fix C0201(consider-iterating-dictionary)
("Consider iterating the dictionary directly instead of calling .keys()")
2016-08-10 13:49:08 +08:00
Jeffrey 'jf' Lim
921be89d32 Add unit tests for sys.list_renderers 2016-08-10 09:13:08 +08:00
Jeffrey 'jf' Lim
ea23f7d27d Fix bug in sys.list_returners (all non-glob arguments return empty) 2016-08-10 08:43:47 +08:00
Jeffrey 'jf' Lim
70ae9704a0 Fix bug in sys.list_runners (all non-glob arguments return empty) 2016-08-10 08:30:30 +08:00
rallytime
3d5c160b5d Use Carbon instead of Boron for new develop functions/args/kwargs 2016-08-09 16:07:39 -06:00
twangboy
00eff0a1a8 Fix architecture detection 2016-08-09 21:26:57 +00:00
rallytime
6dcea4f705 Remove deprecated outputter kwarg from fileserver runner 2016-08-09 15:16:20 -06:00
twangboy
153b674fc5 Detect 32/64 bit installation 2016-08-09 21:09:36 +00:00
twangboy
23fbc7890c Fix previous version detection 2016-08-09 20:57:33 +00:00
twangboy
e661540526 Fix VC Compiler detection for 32bit Windows 2016-08-09 20:44:47 +00:00
twangboy
978775714b More standardization 2016-08-09 20:11:45 +00:00
Jeffrey 'jf' Lim
af19c762f2 Fix up sysmod_test.py unit test file:
- take a stab at actual mocking
- general fix of tests, including for all *_doc tests
2016-08-10 04:04:47 +08:00
twangboy
5787e27af1 Standardize build scripts 2016-08-09 19:53:55 +00:00
Jeffrey 'jf' Lim
fc66053be4 Cosmetic change to modules/sysmod.py: s/fun/func 2016-08-10 03:51:52 +08:00
Jeffrey 'jf' Lim
9c212a5e7a Fix bug + logic in sys.renderer_doc (any arg with no glob returns all functions) 2016-08-10 03:31:51 +08:00
twangboy
99ac8acce6 Add path to Python Scripts to build.bat 2016-08-09 19:27:28 +00:00
rallytime
cccdf14f1b Change deprecation tag from Oxygen to Carbon
Deprecation tags should denote when an option goes on the deprecation
path and a warn_until is issued, not when the option is removed completely.
2016-08-09 13:26:28 -06:00
Vladimir Pouzanov
fbc88b23ae Actually fixed dockerng.list_tags 2016-08-09 20:21:02 +01:00
Nicole Thomas
904324d7b3 Reorganize deprecation docs into sections in Carbon release notes (#35307)
This makes all of the deprecations more readable and easier to find
things that have been deprecated in the Carbon release.
2016-08-09 13:20:12 -06:00
twangboy
4f78bb0f34 Add path, fix uninstaller 2016-08-09 18:58:58 +00:00
Sergey Kizunov
da41095608 Fix: salt-key -f master.pub
The command `salt-key -f master.pub` was broken by PR #35015. This is
because it now requests the keys from the master via
`salt.wheel.WheelClient` and always filters out `local` in the return
value. Change it so that `local` is not filtered out in the case of the
`finger` and `finger_all` commands. These commands require all keys
including the local ones.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-08-09 13:58:16 -05:00
twangboy
098a6bc538 Fix typos in documentation 2016-08-09 17:27:45 +00:00
twangboy
8e056168a4 Add function for adding to the path 2016-08-09 17:23:49 +00:00
twangboy
418e649be7 Fix App Paths entries 2016-08-09 17:23:49 +00:00
twangboy
0a5d804a40 Update documentation for new installer 2016-08-09 17:23:48 +00:00
twangboy
d453199b56 Fix services not starting correctly, use nsExec 2016-08-09 17:23:48 +00:00
twangboy
cc88e50a42 Add Salt-Master to installer 2016-08-09 17:23:47 +00:00
twangboy
9218278873 Fix Title/Subtitle on Minion Config page 2016-08-09 17:23:47 +00:00
twangboy
a860580c79 Change GUID for python 2.7.12 2016-08-09 17:23:47 +00:00
twangboy
31ffb8f6e5 Add dependency dlls to script 2016-08-09 17:23:46 +00:00
twangboy
4149f0c237 Update pip requirements 2016-08-09 17:23:46 +00:00
choffman
5b85a610b6 Option to prepend the CN to the copypath filename
This patch creates an option to add the CN to the copypath filename.
If set to True, files go from this:
AA:BB:CC:DD:EE:FF.crt
to this:
www.example.com-AA:BB:CC:DD:EE:FF.crt

It is designed to add some clarity when a directory may be filled
with files.
2016-08-09 12:52:19 -04:00
Brian Glogower
43274da72d Fix pylint of spacing between inline comment
Update docstring to remove lower case version of possible keys
2016-08-09 09:14:28 -07:00