Colton Myers
001373052e
Use .next() instead of dummy loop, Fix #5120
2013-05-21 18:01:21 -06:00
David Boucha
706566a944
Merge pull request #5181 from UtahDave/develop
...
add missing globals for Windows stuff.
2013-05-21 16:58:25 -07:00
David Boucha
42ecd4295b
add missing globals
2013-05-21 17:57:43 -06:00
David Boucha
70c2e56425
Merge pull request #5180 from UtahDave/develop
...
Make pkg state work with Windows packages
2013-05-21 16:56:42 -07:00
Pedro Algarvio
0aeb2af20f
Add yum to freezer includes if we can actually freeze it, ie, is it available?
2013-05-22 00:45:54 +01:00
Pedro Algarvio
39631427b4
Double to single quotes.
2013-05-22 00:36:31 +01:00
David Boucha
916e3f02e4
Make pkg state work with Windows packages
2013-05-21 17:23:30 -06:00
Seth House
65234c01e2
Merge pull request #5179 from basepi/retcode5112
...
Remove retcode arg from cmd._run, Fix #5112
2013-05-21 15:41:23 -07:00
Emile 'iMil' Heitor
e5535e93dd
Removed useless commands and added Xen dom0 support for NetBSD
2013-05-22 00:22:06 +02:00
Colton Myers
7a0d59bf52
Remove retcode arg from cmd._run, Fix #5112
...
Checked for external uses, there are none. Really not sure what it was
gaining us in the first place, but it's been out of use since the fix
for #2640 .
2013-05-21 15:33:30 -06:00
Joseph Hall
dddb91a12e
Merge pull request #5178 from virtua-network/imgadm_feature
...
smartos_imgadm : add a *basic* search option and an update function
2013-05-21 14:25:48 -07:00
mguegan
cc642f9820
smartos_imgadm : add a *basic* search option and an update function
...
* update_installed() (aka. imgadm update)
* avail(search=None) : outputs the last occurrence of 'string' from
'''imgadm avail'''
2013-05-21 23:16:13 +02:00
David Boucha
ca78e5b44b
Merge pull request #5176 from basepi/jinjadocs
...
Fix syntax error in jinja context examples
2013-05-21 12:44:04 -07:00
Colton Myers
5971b0e8a8
Fix syntax error in jinja context examples
...
Bad indentation meant it would pass in the pieces of context as part of
the **kwargs, rather than as part of the context kwarg.
2013-05-21 13:42:00 -06:00
David Boucha
0c8e0fc569
Merge pull request #5175 from basepi/context5161
...
Make explicit context overwrite kwargs for templating, Fix #5161
2013-05-21 12:39:48 -07:00
Colton Myers
1287d07aa2
Make explicit context overwrite kwargs for templating, Fix #5161
2013-05-21 12:38:08 -06:00
Colton Myers
48645317fa
Merge pull request #5174 from UtahDave/develop
...
Fix list_pkgs on Windows.
2013-05-21 11:29:21 -07:00
David Boucha
58d1f9de5a
remove unneeded quotes
2013-05-21 12:27:49 -06:00
Erik Johnson
d15082970e
Merge pull request #5173 from terminalmage/quickfix
...
Use a deepcopy when assigning list_pkgs results to __context__
2013-05-21 11:13:32 -07:00
Erik Johnson
0a007f846e
Use a deepcopy when assigning list_pkgs results to __context__
...
This fixes a problem that Dave found where a simple assignment caused
the data in the return dict to be linked to __context__['pkg.list_pkgs']
due to a shallow copy, and thus the call to pkg_resource.stringify was
modifying the data in __context__['pkg.list_pkgs']. Dave will be pushing
a commit later on that fixes this in win_pkg.py, this commit fixes it in
the rest.
2013-05-21 13:10:04 -05:00
David Boucha
664aadcc22
Remove old option to pass in pkg names
2013-05-21 12:07:27 -06:00
David Boucha
e44b584145
do a deep copy of ret. Don't alter original
2013-05-21 12:00:15 -06:00
Geoff Garside
61072a0d98
Add Xen DomU detection for FreeBSD.
2013-05-21 13:27:32 +01:00
Emile 'iMil' Heitor
a7a102a982
Implemented XenAPI backend as a 'virt' __virtual__ module to handle the Xen hypervisor
2013-05-21 13:01:44 +02:00
Thomas S Hatch
7eaee6d9a0
Merge pull request #5165 from s0undt3ch/develop
...
Don't try to get the `_fmt` attribute if there's no formatter.
2013-05-21 01:50:49 -07:00
Thomas S Hatch
5982e79a68
Merge pull request #5163 from basepi/groups5154
...
Don't memoize user.list_groups, Fix #5154
2013-05-21 01:49:10 -07:00
Thomas S Hatch
7069385b4f
Merge pull request #5162 from minaguib/develop
...
jinja2 templates: Enable the 'do' and 'loopcontrols' extensions
2013-05-21 01:47:42 -07:00
Thomas S Hatch
517722805e
Merge pull request #5159 from hulu/grains-shadowing
...
loader: rename vars to avoid shadowing grains() func
2013-05-21 01:45:58 -07:00
Thomas S Hatch
9d3737f8ec
Merge pull request #5158 from cvrebert/patch-1
...
grains.core.saltpath: path -> salt_path, to avoid shadowing same-named func
2013-05-21 01:42:12 -07:00
Thomas S Hatch
eff3423383
Merge pull request #5157 from cvrebert/patch-2
...
solr mod: fix apparent incomplete var renaming: name=>core
2013-05-21 01:41:42 -07:00
Thomas S Hatch
375bd4763f
Merge pull request #5156 from timl/develop
...
Replace human_name with humanname.
2013-05-21 01:39:46 -07:00
Thomas S Hatch
a3bea239a3
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-05-21 01:58:14 -06:00
David Boucha
2cce569890
Merge pull request #5168 from UtahDave/develop
...
Some small doc improvements for Windows Repo page
2013-05-20 22:32:52 -07:00
David Boucha
1608814fc9
Some small doc improvements for Windows Repo page
2013-05-20 23:30:15 -06:00
Erik Johnson
5d25522197
Merge pull request #5167 from terminalmage/issue5166
...
zypper: fix pkg.latest_version
2013-05-20 22:09:03 -07:00
Erik Johnson
31fffef588
zypper: fix pkg.latest_version
...
latest_version was using list_upgrades(), which in turn ran
'zypper list-updates'. This, however, does not give information for
packages which are available but are not presently installed. Changed
latest_version so that it parses the output from 'zypper info'.
Fixes #5166 .
2013-05-21 00:05:00 -05:00
Pedro Algarvio
c1d00671d4
Merge pull request #5164 from basepi/stateconf5160
...
Log the exception rather than ignoring it, Fix #5160
2013-05-20 16:47:59 -07:00
Pedro Algarvio
b0705c3010
Don't try to get the _fmt attribute if there's no formatter. Refs saltstack/salt-cloud#589 .
2013-05-21 00:10:07 +01:00
Colton Myers
e3df459719
Log the exception rather than ignoring it, Fix #5160
2013-05-20 17:03:38 -06:00
Colton Myers
0b12d2e396
Don't memoize user.list_groups, Fix #5154
2013-05-20 15:45:26 -06:00
Mina Naguib
d205665aa1
jinja2 templates: Enable the 'do' and 'loopcontrols' extensions
...
See http://jinja.pocoo.org/docs/extensions/ for their documentation
2013-05-20 16:46:46 -04:00
Chris Rebert
647a732b50
loader: rename vars to avoid shadowing grains() func
2013-05-20 12:05:10 -07:00
Chris Rebert
e7315513d6
grains.core.saltpath: path -> salt_path, to avoid shadowing same-named func
2013-05-20 12:54:43 -06:00
Tim Laszlo
105671ce5a
pkrgrepo verification fails
...
When verifying pakages, skip the repo keyword and ensure the
value is a string. Always fails for gpgcheck with yum.
2013-05-20 13:49:14 -05:00
Chris Rebert
9270bf991f
fix other instance in this file
2013-05-20 11:28:49 -07:00
Chris Rebert
5e37ce5c33
solr mod: fix apparent incomplete var renaming: name->core
...
discovered via pylint W0631
2013-05-20 12:25:56 -06:00
Tim Laszlo
89b6a07267
Replace human_name with humanname.
...
The documentation indicates
human_name should hold to a human readble name for the repository.
The code is looking for humanname.
2013-05-20 13:14:17 -05:00
Joseph Hall
ee113486b5
Merge pull request #5155 from virtua-network/module_imgadm
...
Add module for SmartOS imgadm command
2013-05-20 10:09:35 -07:00
Thomas S Hatch
311006d2b5
Make the multi master scheduler detect down masters
2013-05-20 10:41:43 -06:00
mguegan
71abee6a9b
Add module for SmartOS imgadm command
...
'imgadm' is a SmartOS command for managing virtual machines images. This first
version provides the following functions :
* imgadm.version()
* imgadm.avail()
* imgadm.show(uuid)
* imgadm.import_image(uuid)
* imgadm.list_installed()
* imgadm.get(uuid)
* imgadm.delete(uuid)
2013-05-20 18:24:43 +02:00
