Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
twellspring
6461b37e0f
Clarify Mine Functions Aliases documentation
...
Clarify how to specify positional parameters.
2015-03-10 11:12:17 -07:00
Mike Place
393cf9c13a
Note the change to tcp keepalives in release notes
2015-03-10 10:45:16 -06:00
Mike Place
56bac362fd
Change bootstrap instructions to two liner
2015-03-09 18:24:53 -06:00
jfindlay
8ff95ac138
Merge pull request #21443 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-09 16:55:25 -06:00
Thomas S Hatch
dc691ae3f4
Add return data example
2015-03-09 14:33:12 -06:00
Thomas S Hatch
bf201865d0
MOAR beacons docs
2015-03-09 14:10:06 -06:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Thomas S Hatch
ecacdcbe75
Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop
2015-03-09 11:07:14 -06:00
Elias Probst
583239b893
Suggest a separate repo for top.sls.
...
This replaces the suggestion to keep `top.sls` out of other branches
which is rather unpractical, as it would require to manually delete
it from each new created branch and prevent deleting it when merging
the branch back into `master`.
2015-03-08 09:50:20 +01:00
Erik Johnson
0aa1029f24
correction to grains example
2015-03-07 11:40:43 -07:00
Vynce Montgomery
2723cb57a3
finish changing variable name
...
a partial edit, renaming a variable for clarity, missed some cases.
2015-03-06 23:33:05 -08:00
James Lamb
f18dc55ccb
Merge branch 'develop' of https://github.com/jimmystewpot/salt into develop
2015-03-06 15:12:55 +11:00
James Lamb
ae1728ec4f
Update documentation to include how to set a static IP within the VPC for aws/ec2
2015-03-06 15:10:02 +11:00
rallytime
414990fc03
2015.2 --> 2015.2.0
2015-03-05 15:02:01 -07:00
rallytime
e9402e7564
Remove "Lithium" and change to "2015.2.0" for versionadded tags
2015-03-05 12:44:22 -07:00
Nitin Madhok
b9cdd2b089
Replacing provider aws with ec2 fixes #21274
2015-03-04 20:49:00 -05:00
s8weber
ad869c74b1
add pillar_safe_render_error config
...
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
2015-03-04 10:22:29 -05:00
Boris Feld
e97a34cae2
Update salt_token name
...
salt_token seems to be now saved as ~/salt_token by default (a52ebdac3b/salt/config.py (L2192)
2015-03-04 11:52:51 +01:00
Alexander Schwartz
0887dfe5d8
make latest 2014.7.x releases visible in documentation
2015-03-03 17:14:06 -07:00
Seth House
1399949196
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-03-02 14:19:37 -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
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
48fed17876
Add warnings about static IP configuration
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
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
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
