Thomas S Hatch
3aaca8de0c
Merge pull request #6479 from andersbetner/issue6464
...
Fix for #6464
2013-08-01 13:56:16 -07:00
Joseph Hall
39486a167c
Merge pull request #6480 from UtahDave/doc_reactor
...
Add example of using expr_form
2013-08-01 13:32:59 -07:00
David Boucha
b3bff31a40
Add example of using expr_form
2013-08-01 14:29:49 -06:00
Anders Betnér
3e4543a6b7
Use correct keys when dealing with the defaults dict
...
When checking the defaults dict the keys "m_name" and "m_fun" are already renamed to "name" and "fun" so us arg instead of rarg
2013-08-01 21:47:25 +02:00
Joseph Hall
7e15f606f9
Merge pull request #6478 from cvrebert/patch-2
...
ssh: add missing import, fix typo
2013-08-01 12:32:25 -07:00
Chris Rebert
be5f7058ad
ssh: add another missing import (copy std lib module)
2013-08-01 12:29:40 -07:00
Chris Rebert
c1d2e20afa
ssh: add missing import, fix typo
...
************* Module salt.ssh
E1101:439,18:prep_trans_tar: Module 'json' has no 'dumpd' member
E0602:454,4:prep_trans_tar: Undefined variable 'shutil'
2013-08-01 12:24:34 -07:00
Erik Johnson
ed2e414512
Merge pull request #6477 from terminalmage/docs
...
pkg, not package
2013-08-01 11:02:43 -07:00
Erik Johnson
c490a73517
pkg, not package
2013-08-01 13:01:49 -05:00
Thomas S Hatch
67c6dbb617
Add trans_tar generation to detatched state system
2013-08-01 11:51:04 -06:00
Joseph Hall
d1b33abad1
Merge pull request #6476 from UtahDave/add_require_sls
...
Add doc on requiring an entire sls file
2013-08-01 10:07:49 -07:00
David Boucha
c552c6b537
Add doc on requiring an entire sls file
2013-08-01 11:03:21 -06:00
Erik Johnson
1db19b1d04
Merge pull request #6475 from terminalmage/release_notes
...
Add fix for #6471 to 0.16.2 release notes
2013-08-01 09:55:29 -07:00
Erik Johnson
b2c960fadb
Add fix for #6471 to 0.16.2 release notes
2013-08-01 11:53:15 -05:00
Joseph Hall
b6036aba11
Merge pull request #6474 from terminalmage/issue6471
...
Ignore requisites in kwargs for pkgrepo.managed states
2013-08-01 09:51:11 -07:00
Erik Johnson
382270d584
Ignore requisites in kwargs for pkgrepo.managed states
...
This fixes #6471 .
2013-08-01 11:35:17 -05:00
Erik Johnson
20316bbb00
Merge pull request #6473 from terminalmage/release_notes
...
Add additional bugfixes to 0.16.2 release notes
2013-08-01 08:11:30 -07:00
Erik Johnson
f035d20b6a
Add additional bugfixes to 0.16.2 release notes
2013-08-01 10:09:55 -05:00
Joseph Hall
3edee9ccbc
Merge pull request #6458 from ranl/develop
...
apache server-status function
2013-08-01 05:23:05 -07:00
ran
8a1c5415e0
added a note in apache.server_status function
2013-08-01 12:08:53 +03:00
Thomas S Hatch
545d8eccef
Merge pull request #6468 from intchanter/develop
...
Used a safer method to get proc_fn
2013-07-31 21:29:34 -07:00
Thomas S Hatch
eb0dae185a
Merge pull request #6469 from terminalmage/release_notes
...
Add release notes for 0.16.2
2013-07-31 21:26:16 -07:00
Erik Johnson
4ad4f2f751
Added a few more changes to 0.16.2 release notes
2013-07-31 23:09:36 -05:00
Intchanter
83c2e61525
Used a safer method to get proc_fn
...
Previously, this called get_proc_dir(), which clears the contents of the
specified directory, resulting in issue #6238 .
2013-08-01 04:07:46 +00:00
Erik Johnson
59a805607c
Add release notes for 0.16.2
2013-07-31 22:55:52 -05:00
Thomas S Hatch
8e91f4aef9
Merge pull request #6465 from s0undt3ch/features/payload-testing
...
Added unit test for list nested `OrderedDict`'s. Refs #6460 .
2013-07-31 20:35:15 -07:00
Erik Johnson
01beb1eb62
Merge pull request #6466 from terminalmage/docs
...
Docmentation tweaks in advance of 0.16.2 release
2013-07-31 18:44:52 -07:00
Erik Johnson
70e236d028
Docmentation tweaks in advance of 0.16.2 release
2013-07-31 20:43:37 -05:00
Pedro Algarvio
86779d92d2
Simplify OrderedDict -> dict conversion.
2013-08-01 01:37:29 +01:00
Pedro Algarvio
d6e0b2a5a2
Added unit test for list nested OrderedDict's. Refs #6460 .
2013-08-01 01:34:37 +01:00
Colton Myers
9c1950d548
Merge pull request #6463 from terminalmage/issue6462
...
Fix extfs module kwarg_map
2013-07-31 12:57:58 -07:00
Erik Johnson
5ac2e01051
Fix extfs module kwarg_map
...
This fixes #6462 . the "kwarg_map" was not taking into account the
"private" kwargs that get passed.
2013-07-31 14:52:58 -05:00
David Boucha
282e3526f0
Merge pull request #6461 from terminalmage/issue6303
...
Fix 32-bit binary package installs on 64-bit OS
2013-07-31 12:45:47 -07:00
Erik Johnson
1d0d5b65ae
Docstring tweak for pull req #6461
2013-07-31 13:01:18 -05:00
Erik Johnson
047c338ac9
Fix 32-bit binary package installs on 64-bit OS
...
This fixes #6303 . It also forces a change in SLS for apt-based systems,
to avoid a name collision with the 64-bit version of the package. 32-bit
binary packages must now be referred to using pkgname:arch, as they
appear in dpkg --list.
2013-07-31 12:56:10 -05:00
David Boucha
f1017bf478
Merge pull request #6460 from basepi/ordereddict
...
Convert OrderedDicts inside of lists
2013-07-31 10:23:18 -07:00
Colton Myers
f5368e2fab
Convert OrderedDicts inside of lists
2013-07-31 11:17:50 -06:00
Colton Myers
406a2de28b
Comment out unused import of sys
2013-07-31 10:32:49 -06:00
ran
f6940e0fcb
import urllib2 in apache module
2013-07-31 18:05:54 +03:00
ran
035bfec4a9
apache server-status function
2013-07-31 17:56:54 +03:00
Thomas S Hatch
3368a3d27a
Merge pull request #6457 from s0undt3ch/hotfix/pylint-anomalous-backslash
...
Use raw strings for proper backslashes.
2013-07-31 07:11:19 -07:00
Pedro Algarvio
9b09697352
Use raw strings for proper backslashes.
2013-07-31 06:13:23 +01:00
Thomas S Hatch
94baa88e8d
Merge pull request #6454 from mafrosis/git_unless_onlyif
...
Add support for unless/onlyif to git.latest
2013-07-30 21:30:37 -07:00
Thomas S Hatch
fa8e3dbeae
Merge pull request #6452 from tsheibar/issue-6427
...
Issue #6427 fix : Choose Package Provider on CentOS Boxes with Custom /etc/centos-release Content
2013-07-30 21:29:07 -07:00
Ted Sheibar
4cb95adf54
Issue #6427 fix : Added conditional block to grains/core.py to address CentOS boxes that may have custom content within /etc/centos-release
2013-07-30 19:45:56 -07:00
Pedro Algarvio
cc9de9a2ef
Merge pull request #6455 from jacksontj/develop
...
Fixing a typo ;)
2013-07-30 18:58:31 -07:00
Thomas Jackson
46f2fe8233
Fixing a typo ;)
2013-07-30 18:46:24 -07:00
mafro
7138d768c5
add support for unless/onlyif to git.latest
2013-07-31 01:12:35 +00:00
Pedro Algarvio
e921f7a272
Merge pull request #6451 from cvrebert/patch-1
...
states.file: avoid the `copy` module; conflicts w/ new copy() func
2013-07-30 11:49:39 -07:00
Chris Rebert
b817833e1e
states.file: rewrite to avoid using the copy module, which conflict w/ new copy() func
...
************* Module salt.states.file
E0102:1992,0:copy: function already defined line 139
2013-07-30 11:16:56 -07:00
