Thomas S Hatch
7d5d095bae
Merge pull request #19719 from terminalmage/archive-fixes
...
Fix archive.zip, archive.unzip
2015-01-14 12:16:55 -07:00
Thomas S Hatch
9df5e5b4e2
Merge pull request #19718 from sjansen/patch-5
...
Enable salt-cloud bootstrap with ssh gateway
2015-01-14 12:13:28 -07:00
Thomas S Hatch
5a3bd60867
Merge pull request #19715 from kev009/freebsd-kmods
...
Switch FreeBSD kmod module to use loader.conf
2015-01-14 12:12:20 -07:00
Thomas S Hatch
1e9a213bdb
Merge pull request #19705 from cachedout/issue_19364
...
Warn about unsupported vt in cmd mod
2015-01-14 12:11:25 -07:00
Thomas S Hatch
060042d3c7
Merge pull request #19703 from cachedout/issue_19535
...
Return unique list of minions to be batched.
2015-01-14 12:09:34 -07:00
Thomas S Hatch
d204fe4f8e
Merge pull request #19698 from basepi/filemanagedcontents19669
...
Force contents to string under Falsey conditions too for file.managed
2015-01-14 12:09:14 -07:00
Nicole Thomas
7e0b461548
Merge pull request #19710 from rallytime/bp-19580
...
Backport #19580 to 2014.7
2015-01-14 08:39:13 -07:00
Nicole Thomas
91d13e5d73
Merge pull request #19727 from rallytime/pylinting_fifteen
...
Whitespace fix
2015-01-14 08:33:10 -07:00
rallytime
7ae691d049
Whitespace fix
2015-01-14 08:32:28 -07:00
Pedro Algarvio
b847109255
Merge pull request #19722 from rallytime/fix_19453
...
Remove old --out options from salt-cloud docs
2015-01-14 13:59:37 +00:00
rallytime
4a1a5123f2
Remove old --out options from salt-cloud docs
...
Fixes #19453
2015-01-13 21:39:27 -07:00
Erik Johnson
24752ffe93
Fix archive tests
2015-01-13 22:19:14 -06:00
Erik Johnson
9e9c0b182e
Improve docstrings
2015-01-13 22:17:54 -06:00
Erik Johnson
4f74473db4
Remove 'recurse' argument from archive.zip
...
I added this a few days ago, and have decided that it is better not to
have this argument, that recursing should be the default behavior.
2015-01-13 22:01:57 -06:00
Erik Johnson
fa3c3afaaa
Docstring corrections
2015-01-13 21:34:21 -06:00
Erik Johnson
904f9b6c90
Fix archive tests
...
This fixes references to the badly-named legacy zip and unzip functions,
as well as skipping the unrar test when neither unrar and rar are
installed.
2015-01-13 21:07:23 -06:00
Erik Johnson
62b7e12415
os.path.relpath -> salt.utils.relpath
...
Also clean up some imports
2015-01-13 21:06:13 -06:00
Erik Johnson
5d76de8dd9
Add salt.utils.relpath to work around Python bug 5117
2015-01-13 21:01:34 -06:00
Stuart Jansen
16b30f34bb
Enable salt-cloud bootstrap with ssh gateway
2015-01-13 19:07:14 -07:00
Kevin Bowling
5dbfd0241f
Switch freebsdkmod to use loader.conf
2015-01-13 17:20:41 -07:00
Nicole Thomas
97a815f7d0
Merge pull request #19706 from jfindlay/fix_bsd_cmds
...
fix freebsd commands
2015-01-13 17:11:37 -07:00
rallytime
43ab12fd0e
Whitespace fix
2015-01-13 15:25:23 -07:00
Nicole Thomas
0ca2dbf759
Merge pull request #19709 from rallytime/bp-19523
...
Backport #19523 to 2014.7
2015-01-13 15:23:47 -07:00
Erik Johnson
fc809280a8
Finish archive.{,un}zip feature parity with legacy funcs
...
Added support for runas to these functions and made some docstring
fixes.
2015-01-13 16:01:35 -06:00
Erik Johnson
ecb15c01bd
archive.{,un}zip feature parity with legacy funcs
...
This begins the process of making the new archive.zip and archive.unzip
functions work like the legacy versions (now named archive.cmd_zip,
archive.cmd_unzip).
2015-01-13 15:59:25 -06:00
Flavian
374ab04011
Backport #19580 to 2014.7
...
Conflicts:
salt/cloud/clouds/msazure.py
2015-01-13 14:24:49 -07:00
Mike Place
c172470c30
Try giving some rest tornado requests a little more time
2015-01-13 14:17:55 -07:00
Nicole Thomas
ac24085f0d
Merge pull request #19701 from rallytime/bp-19593
...
Backport #19593 to 2015.2
2015-01-13 14:14:53 -07:00
Justin Findlay
2717c1bd1c
fix freebsd commands
2015-01-13 13:09:49 -07:00
Mike Place
503dfea26b
Warn about unsupported vt in cmd mod
...
Closes #19364
2015-01-13 13:09:23 -07:00
Mike Place
f04a81989b
Return unique list of minions to be batched.
...
Refs #19535
2015-01-13 12:24:45 -07:00
Mike Place
b39dbe9686
Give event-based mines time to propogate
2015-01-13 12:19:53 -07:00
Colton Myers
9390886412
Merge pull request #19699 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-13 11:59:45 -07:00
Colton Myers
2a6c9a8165
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/ssh/index.rst
2015-01-13 11:58:58 -07:00
Colton Myers
95c82b10ce
Force contents to string under Falsey conditions too
...
Ref #19669
2015-01-13 11:52:05 -07:00
Nicole Thomas
c215532a7f
Merge pull request #19692 from rallytime/pylint_fifteen
...
Pylint fix for 2015.2 branch
2015-01-13 10:40:15 -07:00
rallytime
7ff92cec9a
Pylint fix for 2015.2 branch
2015-01-13 10:39:19 -07:00
Thomas S Hatch
80ec40b197
Merge pull request #19689 from rallytime/locale_versionadded
...
Add versionadded directives to newer locale functions
2015-01-13 08:43:49 -07:00
rallytime
0b96b134dc
Add versionadded directives to newer locale functions
...
Fixes #19607
2015-01-13 08:40:24 -07:00
Thomas S Hatch
2da27f0ddd
Merge pull request #19682 from kev009/freebsd-kmods
...
FreeBSD kmod bugfixes
2015-01-13 08:28:12 -07:00
Thomas S Hatch
640a717859
Merge pull request #19678 from davidjb/doc-saltfile-ssh
...
Expand documentation about Saltfile for salt-ssh
2015-01-13 08:26:06 -07:00
Thomas S Hatch
200a6ea47f
Merge pull request #19676 from davidjb/git-error-verbosity
...
Improve error reporting for failing git module commands
2015-01-13 08:24:55 -07:00
Thomas S Hatch
ba857d6694
Merge pull request #19672 from elmarshar/patch-2
...
Update mysql_query.py
2015-01-13 08:19:34 -07:00
Thomas S Hatch
1eb0b4b0e2
Merge pull request #19661 from basepi/sysctlretcode19606
...
Suppress retcode warnings for systemd enabled check, Fixes #19606
2015-01-13 08:13:15 -07:00
Kevin Bowling
edd4fba112
Bugfix my freebsdkmod implementation
2015-01-13 04:18:25 -07:00
Kevin Bowling
1373a257e5
Garbage collect unused private method
2015-01-13 02:15:19 -07:00
Kevin Bowling
1c7e55e175
pep8 kmod and freebsdkmod execution modules
2015-01-13 01:38:47 -07:00
Kevin Bowling
91cf8afdb8
Fix freebsdkmod lsmod()
2015-01-13 01:34:50 -07:00
Kevin Bowling
5873041a12
Add persistent module capabilities to freebsdkmod
2015-01-13 01:24:24 -07:00
David\ Beitey
839968f637
Expand documentation about Saltfile for salt-ssh
2015-01-13 16:50:29 +10:00
