Thomas S Hatch
93387cab85
Merge pull request #5725 from chideit/npm-version-ranges
...
Allows specifying version ranges in NPM states
2013-06-25 12:24:44 -07:00
Thomas S Hatch
b7f86d851e
Merge pull request #5724 from basepi/miniontypeerror5723
...
Improve TypeError reporting in minion.py, Fixes #5723
2013-06-25 12:23:33 -07:00
Thomas S Hatch
b6dde24064
Merge pull request #5726 from chideit/file-mode-none
...
Fix a regression where not specifying "mode" in a file.managed stanza was throwing an error.
2013-06-25 12:22:30 -07:00
Samuel Cormier-Iijima
7c3f333a70
Fix a regression where not specifying "mode" in a file.managed stanza was throwing an error.
2013-06-25 19:12:05 +00:00
Samuel Cormier-Iijima
84084ee4bd
Allows specifying version ranges in NPM, so that e.g. npm.install "coffee-script@<1.6.0"
...
will install the latest matching version and the npm.installed state will only install if
the current version does not match.
2013-06-25 17:49:52 +00:00
Colton Myers
a1145e6b62
Log the actual exception in the warning message
2013-06-25 11:49:31 -06:00
Colton Myers
f52fdcc687
Remove old warning log (handled in previous log), Fixes #5723
2013-06-25 11:47:32 -06:00
Joseph Hall
ac2ff067d5
Changing from printf style to string formatting
2013-06-25 08:33:16 -06:00
Laurent Peuch
f0ec9ff5b5
more detailed feedback if the ssh.set_known_host failed to append to known hosts file
...
Commands should always tell the reason on why they have failed.
2013-06-25 16:28:20 +02:00
Joseph Hall
ae3bc818ca
Merge pull request #5713 from hulu/pkgutil
...
version => nver, to avoid shadowing version() func
2013-06-24 18:15:35 -07:00
Joseph Hall
637a3ca87c
Merge pull request #5712 from hulu/pecl-fix
...
fix undefined var in modules.pecl
2013-06-24 18:15:12 -07:00
Joseph Hall
d10753cba1
Merge pull request #5711 from hulu/test-fixes
...
tty => teletype, to avoid shadowing
2013-06-24 18:14:54 -07:00
Chris Rebert
4025f0689e
version => nver, to avoid shadowing version() func
2013-06-24 18:12:36 -07:00
Chris Rebert
6c9d6c9d85
fix undefined var in modules.pecl
2013-06-24 18:05:39 -07:00
Chris Rebert
54ba6adb40
tty => teletype, to avoid shadowing
2013-06-24 17:56:22 -07:00
Joseph Hall
cfdc8b03d3
Merge pull request #5710 from cvrebert/patch-1
...
utils.parsers: fix pylint W1401 (Anomalous backslash in string) problems
2013-06-24 17:33:43 -07:00
Joseph Hall
2876f474c4
Merge pull request #5709 from cvrebert/patch-2
...
cmdmod: fix W1401 (Anomalous backslash in string) problems
2013-06-24 17:33:08 -07:00
Chris Rebert
8b619e32bc
utils.parsers: fix pylint W1401 (Anomalous backslash in string) problems
2013-06-24 17:29:43 -07:00
Chris Rebert
2bac4808a6
cmdmod: fix W1401 (Anomalous backslash in string) problems
2013-06-24 18:27:11 -06:00
Joseph Hall
a241290303
Merge pull request #5708 from UtahDave/develop
...
document pkg.purge on Windows
2013-06-24 17:14:02 -07:00
David Boucha
0c874e9d32
document pkg.purge on Windows
2013-06-24 18:09:17 -06:00
Joseph Hall
8cd92fed80
Merge pull request #5707 from bretep/develop
...
Add bretep to authors
2013-06-24 17:00:49 -07:00
Bret Palsson
6596bbc4ca
Add bretep to authors
2013-06-24 18:55:04 -05:00
Thomas S Hatch
db8e3700ae
Merge pull request #5704 from terminalmage/issue5613
...
Fix case where setting file perms to 000 didn't work
2013-06-24 12:04:58 -07:00
Thomas S Hatch
8c7b67f668
Merge pull request #5702 from icholy/force-color
...
add --force-color
2013-06-24 12:03:38 -07:00
Thomas S Hatch
1aa0399636
Merge pull request #5698 from jorgeecardona/develop
...
Fix restart/update problem in supervisord state, adding a way to force u...
2013-06-24 12:01:57 -07:00
Erik Johnson
4b9b24053c
Fix case where setting file perms to 000 didn't work
...
Due to how Salt handles leading zeros the YAML renderer (strips them), a
value of '000' becomes '', causing tracebacks in some states, as well as
a failure to properly compare the desired mode against the actual mode
of the file. This commit normalizes modes, zero-padding them to replace
zeros removed by the YAML renderer.
It also modifies the YAML renderer to properly handle an input
consisting of all zeros, keeping it from being reduced to an empty
string.
Fixes #5613 .
2013-06-24 13:35:07 -05:00
Ilia Choly
f28fb11368
Added --force-color
2013-06-24 13:13:23 -04:00
Jorge E. Cardona
affa73722d
Fix restart/update problem in supervisord state, adding a way to force update and checking if changes were detected in case a restart is also needed. (Result of module supervisord.update is the actual stdout)
2013-06-24 01:38:41 -05:00
Jorge E. Cardona
5335812514
Fix restart/update problem in supervisord state, adding a way to force update and checking if changes were detected in case a restart is also needed. (Silly Typo)
2013-06-24 00:37:42 -05:00
Jorge E. Cardona
6e8f13d06d
Fix restart/update problem in supervisord state, adding a way to force update and checking if changes were detected in case a restart is also needed
2013-06-24 00:26:41 -05:00
John Anderson
95a75d8a1c
func alias re_service reload, fix #5085
2013-06-23 22:24:29 -06:00
John Anderson
3b0681c737
Add func alias per #5085
2013-06-23 22:21:56 -06:00
John Anderson
373acd241c
dd func alias for bridge.list per #5085
2013-06-23 22:20:20 -06:00
David Boucha
18a0f72936
Merge pull request #5697 from drawsmcgraw/add-docs-for-powershell
...
Added some lines to the docs explaining how to use Powershell as an alte...
2013-06-23 18:29:23 -07:00
root
e606be8355
Added some lines to the docs explaining how to use Powershell as an alternate shell.
2013-06-24 01:04:19 +00:00
David Boucha
51f0058ac9
Merge pull request #5693 from techhat/tty
...
Adding tty function to test module
2013-06-23 14:03:26 -07:00
Joseph Hall
7720198cd0
Adding tty function to test module
2013-06-23 13:48:14 -06:00
Thomas S Hatch
a92665fc5f
Fix #5688
2013-06-22 20:52:44 -06:00
Joseph Hall
3321d57cf4
Merge pull request #5691 from hekevintran/develop
...
Fixed spelling
2013-06-22 14:38:43 -07:00
Kevin Tran
7122651d20
Fixed spelling
2013-06-22 14:24:14 -07:00
Thomas S Hatch
2003bcbe5a
Merge pull request #5690 from s0undt3ch/develop
...
Some logging fixes/additions
2013-06-22 14:02:46 -07:00
Thomas S Hatch
c27b1ec6dc
Merge pull request #5689 from pkruithof/patch-1
...
Fixed version check in case of different preferred state
2013-06-22 14:01:16 -07:00
Pedro Algarvio
6fbc503777
Improved variable naming.
2013-06-22 21:20:16 +01:00
Pedro Algarvio
aa94d3986f
Granular levels show also be set when setting up the console logger.
...
When configuring the log file logging this same operation will be executed again, but it's not an expensive operation.
2013-06-22 21:20:16 +01:00
Pedro Algarvio
130cd902f0
Pop the proper key name.
2013-06-22 21:20:16 +01:00
Peter Kruithof
98802531c6
Fixed version check in case of different preferred state
...
When installing an extension with the `beta` state, the check to see if it's installed failed, because the `pecl list` command returns the version and state, but only the first is checked.
Also, improved the comments to reflect which pecl extension is being handled.
2013-06-22 21:29:05 +03:00
Joseph Hall
ae4aaa37d2
Merge pull request #5687 from zhangcheng/fix_runtests_typo
...
Fix typo
2013-06-22 08:45:46 -07:00
ZHANG Cheng
c86564abb1
Fix typo
2013-06-22 23:31:37 +08:00
Joseph Hall
d40c7ae7af
Merge pull request #5685 from aboe76/develop
...
updated salt.spec file for suse update 0.15.90
2013-06-22 05:59:23 -07:00