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
Thomas S Hatch
8a5b47b5d7
Collect all error data from the wfuncs call
2016-08-09 17:39:14 -06:00
Thomas S Hatch
11864c31b7
supress a stack trace to show clean ssh error
2016-08-09 17:24:56 -06:00
Thomas S Hatch
9fbfa282fa
wow this solves an issue!
2016-08-09 17:05:22 -06:00
rallytime
3d5c160b5d
Use Carbon instead of Boron for new develop functions/args/kwargs
2016-08-09 16:07:39 -06:00
rallytime
75f205e485
Remove legacy compat docs in mysql pillar since the code was removed already
...
Refs #30913
2016-08-09 15:27:11 -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
Ivan Babrou
244c3bd495
Pass port to ssh.check_known_host, closes #35264 ( #35301 )
2016-08-09 13:16:01 -06:00
Erik Johnson
243909f39d
file.recurse: Do not convert octal mode string to int ( #35309 )
...
* Add integration test for #34945
* file.recurse: Do not convert octal mode string to int
When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.
Fixes #34945 .
2016-08-09 13:02:26 -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
Nicole Thomas
31f7d307a7
Merge pull request #35306 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-08-09 12:50:44 -06: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
rallytime
2d3eadfe49
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-09 11:15:48 -06: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
Mike Place
94529d0578
Merge pull request #35229 from lubyou/fix-mac_shadow
...
Ignore import error for pwd module in mac_shadow
2016-08-10 00:48:16 +09:00
Mike Place
ce7aeb6ca4
Merge pull request #35227 from isbm/isbm-osfinger-ubuntu-fix
...
Isbm osfinger ubuntu fix
2016-08-10 00:38:30 +09:00
Mike Place
538fa4dead
Merge pull request #35284 from rallytime/cloud-deprecations
...
Cloud deprecations for Carbon
2016-08-10 00:33:51 +09:00
Mike Place
6a048dcf20
Merge pull request #35298 from svinota/develop
...
beacons: fix pyroute2 import statement
2016-08-10 00:27:55 +09:00
Mike Place
2efc1b333b
Merge pull request #35290 from terminalmage/issue35051
...
Resolve a couple bugs in orchestration output
2016-08-10 00:27:00 +09:00
Mike Place
a082a36cec
Partial Py3 support for TLS module ( #35297 )
2016-08-09 08:48:41 -06:00
Mike Place
a3e29c8274
Final check for running procs ( #35292 )
...
* Final check for running procs
This does a final check to kill any running procs that are lingering.
* Lint
2016-08-09 08:48:06 -06:00
Mike Place
15d088c15f
Avoid str to bytes join in test util ( #35295 )
...
Fixes some shell.call tests.
2016-08-09 08:47:34 -06:00
Mike Place
7980665e1f
Do not reformat strings into ints in py3 when collecting args ( #35293 )
...
Fixes failing client kwarg test under py3
2016-08-09 08:34:30 -06:00
rallytime
840eb16847
Remove unused import
2016-08-09 08:27:31 -06:00
Erik Johnson
d621aa7b61
Update runner/wheel unit tests to reflect new key in ret dict
2016-08-09 08:49:52 -05:00