Henrik Holmboe
553555ba6f
Add apt.held state
...
Uses the new dpkg.get_selections and dpkg.set_selections.
2013-09-06 02:03:43 +02:00
Colton Myers
ccc4e45518
Merge pull request #7081 from s0undt3ch/develop
...
Fix `ssh.recv_known_host` test case
2013-09-05 16:24:49 -07:00
Pedro Algarvio
071917369f
Adapt the test case to saltstack/salt@70b26f30b . Refs #4822
2013-09-05 23:35:36 +01:00
Pedro Algarvio
a3a8707d4a
Create temporary directories first.
2013-09-05 23:32:48 +01:00
mickey
e09ae0d9d7
Merge remote-tracking branch 'upstream/develop' into feature_mknod
2013-09-05 17:28:41 -05:00
mickey
d1571781a1
Documentation edits
2013-09-05 17:22:14 -05:00
Pedro Algarvio
53abda36da
Enforce integration.TMP
usage.
2013-09-05 23:17:23 +01:00
Pedro Algarvio
3a569461b6
Since ssh.recv_known_host
is now known to return None
let's assert it's not None
.
2013-09-05 23:13:13 +01:00
Pedro Algarvio
ba096cdedf
ssh.recv_known_host
is known to return None
, should be flagged as such.
2013-09-05 23:06:41 +01:00
David Boucha
b386267e70
Merge pull request #7073 from equinoxefr/patch-2
...
Update windows-package-manager.rst
2013-09-05 12:01:46 -07:00
Erik Johnson
9f6eb0b8af
Merge pull request #7076 from terminalmage/docs
...
add missing period
2013-09-05 12:01:07 -07:00
Erik Johnson
01f27df7ac
add missing period
2013-09-05 13:59:48 -05:00
Seth House
ebce80d84c
Merge pull request #7075 from terminalmage/docs
...
A bunch of docs commits
2013-09-05 11:58:30 -07:00
Ethan Erchinger
2616904603
properly return dict in mod_repo, except cleanup
2013-09-05 11:57:42 -07:00
Erik Johnson
a5fa95125d
Fix sphinx build warning
...
This fixes an invalid path to the master_tops docs index page.
2013-09-05 13:54:23 -05:00
Erik Johnson
18ddf58868
Grammar fix
...
"How to can get involved" -> "How to get involved"
2013-09-05 13:47:38 -05:00
Erik Johnson
dd30dfeac4
Fix sphinx build warning and move FAQ to root
...
This fixes a warning from new pages not being in a toctree, as well as
moves the new FAQ page from the /ref dir to the root.
2013-09-05 13:46:32 -05:00
Erik Johnson
be039d45b3
Tweak wording for FAQ link in docs index
2013-09-05 13:45:15 -05:00
Erik Johnson
e275ca9921
Fix sphinx build warnings (new modules not in toctree)
2013-09-05 13:43:46 -05:00
Erik Johnson
b603274ecd
Add notes on GitPython issue in salt<=0.16.3
2013-09-05 13:43:08 -05:00
Pierre DOUCET
deb554cd72
Update windows-package-manager.rst
2013-09-05 20:41:26 +02:00
Erik Johnson
c7f655a544
Update the FAQ
...
This commit adds new information to the FAQ, as well as switching from
in-depth documentation for a couple topics to linking to this
documtnation on the relevant pages elsewhere in the docs.
2013-09-05 13:40:10 -05:00
Ethan Erchinger
66e382a25b
indentation issue
2013-09-05 11:30:19 -07:00
Erik Johnson
d05ca4fd63
Fix sphinx build error
...
The '=' for the header did not match the length of the page title.
2013-09-05 13:25:38 -05:00
Erik Johnson
4f97ffbc7c
Remove unnecessary period from top-level title
2013-09-05 13:22:48 -05:00
Erik Johnson
0a67f2f8e7
Add explanation of difference between cmd.wait and cmd.run
2013-09-05 13:20:51 -05:00
Erik Johnson
0e65538832
Fix sphinx build error due to no 📧 role
2013-09-05 13:19:59 -05:00
Ethan Erchinger
af120f632b
should have been try/except, not if statement
2013-09-05 11:18:37 -07:00
Ethan Erchinger
0a62e6eced
only call refresh_db and git-add-repository if repo was previously undefined
...
also strip trailing '/' in get_repo, see comment in code
2013-09-05 11:12:33 -07:00
Joseph Hall
3168a7ac37
Merge pull request #7071 from mgwilliams/docs
...
lxc: fix docs
2013-09-05 10:38:12 -07:00
Matthew Williams
d1209e1cac
lxc: fix docs
2013-09-05 17:22:33 +00:00
Joseph D Rivera
b7faea612f
convert the port to a string
2013-09-05 17:21:27 +00:00
Joseph Hall
13904f36b1
Merge pull request #7070 from mgwilliams/docs
...
double backslashes in docstrings
2013-09-05 10:04:44 -07:00
Matthew Williams
916fe89e0b
double backslashes in docstrings
2013-09-05 16:58:42 +00:00
David Boucha
bd31c5d2fe
Merge pull request #7069 from UtahDave/develop
...
Correct rst underlines that were too short
2013-09-05 09:03:46 -07:00
David Boucha
86e0de1348
Correct rst underlines that were too short
2013-09-05 10:02:55 -06:00
David Boucha
8357ac8e9f
Merge pull request #7068 from equinoxefr/patch-1
...
Adding "wmi windows installer provider" to docs. Fixes #7030
2013-09-05 08:43:48 -07:00
mickey
b9bec305bd
Documented the mknod state
2013-09-05 09:39:11 -05:00
Joseph Hall
35f3d17221
Merge pull request #7065 from mgwilliams/lxc
...
add lxc.info function
2013-09-05 07:28:24 -07:00
mickey
5c6fafb971
Fixed amateur indentation error
2013-09-05 09:15:53 -05:00
Erik Johnson
e2bf055542
Add FAQ page to docs
...
This was added per #7024 .
2013-09-05 09:10:47 -05:00
mickey
5b4eb5c172
Honor test=True across the state and module
2013-09-05 09:08:48 -05:00
mickey
b5969ae571
Updated the comments section for the state file.mknod
2013-09-05 08:41:32 -05:00
Pierre DOUCET
aee8b60f79
Adding "wmi windows installer provider" to docs. Fixes #7030
2013-09-05 13:38:24 +02:00
mickey
b9f2367598
Merge remote-tracking branch 'upstream/develop' into feature_mknod
2013-09-05 06:04:41 -05:00
Pedro Algarvio
b25e201596
Merge pull request #7064 from mgwilliams/docs
...
docs: lxc and seed modules
2013-09-05 01:38:00 -07:00
Ajith Antony
d57cf97ca6
Merge branch 'virt_improvements' of github.com:ajithhub/salt into virt_improvements
2013-09-05 03:28:18 -05:00
Ajith Antony
c5c4c12495
Adds serial port and serial console support
2013-09-05 03:27:15 -05:00
Ajith Antony
4614d68371
Adds serial port and serial console support
2013-09-05 03:25:13 -05:00
Thomas S Hatch
d52f8b7c67
tarfile does not support context in python 2.6
2013-09-05 01:15:15 -06:00