Commit Graph

16038 Commits

Author SHA1 Message Date
Erik Johnson
ef9e7e5ab6 Merge pull request #6487 from s0undt3ch/features/doc-link-to-issues
Replace issue links with the `:issue:` extlink extension.
2013-08-01 17:56:53 -07:00
Erik Johnson
e09e61479d Merge pull request #6488 from terminalmage/docs
A couple docs improvements
2013-08-01 17:49:32 -07:00
Erik Johnson
fa6170d9f4 Add explanation of the kwargs passed to states 2013-08-01 19:48:23 -05:00
Erik Johnson
dbfc6448fa Remove unnecessary question mark 2013-08-01 19:47:46 -05:00
Pedro Algarvio
87472875fe Replace issue links with the :issue: extlink extension. 2013-08-02 01:04:57 +01:00
Thomas S Hatch
5a675e364f Update deploy seq for noblock changes 2013-08-01 17:55:16 -06:00
Erik Johnson
777c83b43e Merge pull request #6486 from terminalmage/docs
Fix RabbitMQ link in 0.16.2 release notes
2013-08-01 16:03:39 -07:00
Erik Johnson
8205940ff6 Fix RabbitMQ link in 0.16.2 release notes 2013-08-01 18:02:59 -05:00
Erik Johnson
03955ed2cd Merge pull request #6484 from terminalmage/docs
Fix rst syntax in 0.16.2 release notes
2013-08-01 15:52:18 -07:00
Erik Johnson
38901bc110 Fix rst syntax in 0.16.2 release notes 2013-08-01 17:51:39 -05:00
Thomas S Hatch
11fbe79652 Merge pull request #6483 from jesusaurus/feature/unmount
Forgot to remove that bit
2013-08-01 15:46:49 -07:00
K Jonathan Harker
cd01d58163 Forgot to remove that bit 2013-08-01 22:38:20 +00:00
Thomas S Hatch
a185663ab2 Don't require opts in unmounting 2013-08-01 16:15:13 -06:00
Thomas S Hatch
de3e80469d Merge pull request #6482 from jesusaurus/feature/unmount
Add unmounted function to the mount state.
2013-08-01 14:54:29 -07:00
K Jonathan Harker
9ca65d835e Add unmounted function to the mount state.
Add the ability to unmount a directory from the filesystem.
2013-08-01 21:45:22 +00:00
Erik Johnson
c318de70c0 Merge pull request #6481 from terminalmage/docs
Add fix for #6464 to 0.16.2 release notes
2013-08-01 14:20:57 -07:00
Erik Johnson
61c30d3a50 Add fix for #6464 to 0.16.2 release notes 2013-08-01 16:20:15 -05:00
Thomas S Hatch
bc77befc54 Fix cruft left by airplane commit 2013-08-01 15:01:05 -06:00
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