Erik Johnson
ec2fe0d553
Add nspawn.remove function
...
Also adds nspawn.destroy as an alias, for those who are used to managing
LXC containers.
2015-03-03 14:38:53 -07:00
Erik Johnson
046a8fed7a
Add compatibility function "remove"
...
For people using a mix of LXC and nspawn containers
2015-03-03 14:36:45 -07:00
Erik Johnson
ee570cf0a2
Add RST file for nspawn
2015-03-03 10:10:50 -07:00
Thomas S Hatch
3467622977
Merge pull request #21229 from thatch45/master_service
...
Engines
2015-03-03 09:35:48 -07:00
Seth House
714921a5dc
Added autosummary placeholders for new models
2015-03-02 22:14:33 -07:00
Seth House
b6c1b2601f
Added new modules to the module indexes
2015-03-02 22:13:42 -07:00
Seth House
1399949196
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-03-02 14:19:37 -07:00
Seth House
57b1f67daa
Added autosummary generated placeholders for the new module docs
2015-03-02 14:07:18 -07:00
Seth House
1382401618
Updated all the module index pages with the latest/newest modules
2015-03-02 13:59:19 -07:00
Seth House
b001cb6534
Added engine modules to modules index in docs
2015-03-02 13:49:17 -07:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
Seth House
4d974d9676
Improved presence docs; added cross-references and localhost caveat
...
Closes #18436 .
2015-02-28 19:22:38 -07:00
Fred Reimer
93a8673349
Merge remote-tracking branch 'upstream/2015.2' into issue_21167
2015-02-28 17:08:56 -05:00
Fred Reimer
883e4d1d1a
Added win_deploy_auth_retries and win_deploy_auth_retry_delay for ec2 cloud
2015-02-28 17:08:44 -05:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Erik Johnson
c734a7db18
Update LXC tutorial to reflect function name change
2015-02-27 23:10:22 -06:00
C. R. Oldham
c9610bc4f2
Merge commit, merge forward 2014.7 to 2015.2
2015-02-27 15:01:30 -07:00
Erik Johnson
341b6622c8
gitfs: Add warning about ssh:// URLs (dulwich)
2015-02-27 14:53:57 -07:00
Erik Johnson
4ce8a9d064
Improve salt fileserver documentation
2015-02-27 14:53:57 -07:00
Erik Johnson
ccf99c7405
Add example of clearing gitfs cache pre-2015.2.0
2015-02-27 14:53:55 -07:00
Erik Johnson
815a1befa9
Add note about dulwich gitfs cache incompatibility
2015-02-27 14:53:55 -07:00
Thomas S Hatch
adef36a0ae
Merge pull request #21122 from jfindlay/add_script_args
...
add args to cmd.script_retcode
2015-02-27 14:00:41 -07:00
Justin Findlay
367f14a4d0
add args to cmd.script_retcode
2015-02-27 10:52:15 -07:00
Erik Johnson
ff66ad3d11
Correct location of network configuration for Debian/Ubuntu
2015-02-27 18:16:13 +01:00
Erik Johnson
a7ba699ad7
remove grains outputter from autosummary
2015-02-27 18:12:18 +01:00
Erik Johnson
48fed17876
Add warnings about static IP configuration
2015-02-27 18:12:18 +01:00
Erik Johnson
abf00abea4
remove the docs' .rst file for deleted grains outputter
...
See e1f8ea6
2015-02-27 18:12:18 +01:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
Mike Place
7cb5500610
Document becaon intervals
2015-02-26 18:00:12 -07:00
Fred Reimer
f94a3cbe2b
Fix quote
2015-02-25 22:57:05 -05:00
Fred Reimer
376e4a6e79
Added documentation information concerning the ability to use instance role credentials
2015-02-25 22:51:45 -05:00
Justin Findlay
79255566b9
revise saltstack/salt contrib documentation
2015-02-25 15:05:21 -07:00
Ryan Lane
1bc840a3a9
Add missing boto docs
2015-02-25 12:50:44 -08:00
Erik Johnson
a2452aa611
gitfs: Add warning about ssh:// URLs (dulwich)
2015-02-24 22:37:30 -06:00
Erik Johnson
db85cd43f7
Improve salt fileserver documentation
2015-02-24 22:37:30 -06:00
Erik Johnson
61cfed60a1
Add example of clearing gitfs cache pre-2015.2.0
2015-02-24 22:37:28 -06:00
Erik Johnson
5bb28b6969
Add note about dulwich gitfs cache incompatibility
2015-02-24 22:37:28 -06:00
Mike Place
d31913118f
ID field for event returns in mysql
2015-02-24 12:20:25 -07:00
jfindlay
a38c17efde
Merge pull request #20901 from aspyatkin/feature-bower
...
Add Bower execution and state modules
2015-02-23 21:40:10 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
jfindlay
ceee052c6f
Merge pull request #20927 from hobakill/develop
...
adding the file paths for 2014.7.2
2015-02-23 10:28:50 -07:00
Nick Hobart
fbedbf74fb
adding the file paths for 2014.7.2
2015-02-23 09:21:39 -06:00
Christian Page
309f977d5e
Add 'Getting Started With vSphere' documentation
2015-02-22 10:31:42 -07:00
Alexander Pyatkin
5edb6cba11
Implement Bower state module
2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0
Implement Bower execution module
2015-02-21 05:56:20 +00:00
Thomas S Hatch
f522bb015d
Merge pull request #20846 from techhat/joyent72
...
Overhaul Joyent driver, mostly for new API
2015-02-20 18:08:15 -07:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
Erik Johnson
396e234848
Update the RHEL installation guide
...
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.
Additionally, it provides better instructions on how to enable EPEL:
- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
EPEL mirror. This is not a good idea since A) the mirror could go
away, and B) we are unfairly sending people to a single mirror when
the Fedora Project has a perfectly good link on their wiki to send
people to a "random" mirror. The install example now uses these links.
2015-02-20 11:59:19 -06:00
Joseph Hall
0ff1d027ab
Add Joyent keyname note to release notes
2015-02-19 14:55:13 -07:00
