Andreas Lutro
d88e071e98
add information about linode location
2015-06-17 17:43:08 +02:00
rallytime
64c565d9be
Add .0 to version number
2015-06-16 21:49:43 -06:00
Peter Tripp
5ed801b98f
Add codenames for 2015.5 and future versions. Trailing newline.
2015-06-16 21:48:41 -06:00
C. R. Oldham
4136dc3160
Merge forward from 2014.7 to 2015.5
2015-06-12 14:24:46 -06:00
C. R. Oldham
ecb0623d7f
Add salt-announce mailing list.
2015-06-12 14:19:27 -06:00
Tim Baker
f13cd418bc
Add extra clarification why jinja comments are needed.
2015-06-12 10:45:41 -06:00
Tim Baker
23749718bb
Fix typo
2015-06-12 10:45:41 -06:00
Tim Baker
6a917471d4
Add some documentation surrounding Jinja comments - refs #24492 , #21217 , #23359
2015-06-12 10:45:41 -06:00
Colton Myers
f96c5029bb
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-06-11 13:14:37 -06:00
Jacob Hammons
f3f34ddff6
2015.5.2 release changes
...
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Bret Fisher
65a11336dc
Fixed Mine example for jinja code block
...
In the Mine example, it has the `mine_functions:` deployed via a pillar file, but in the examples `/srv/salt/haproxy_config` snipit for the jinja code block, it used `expr_form='grain'` to access that mine function, which I couldn't get to work, until I changed it to `expr_form='pillar'`. Hopefully this is the right fix.
2015-06-11 00:50:34 -04:00
Thomas S Hatch
20ada1f8a1
Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment
...
2015.5 dont pollute environment
2015-06-10 20:13:06 -06:00
Jacob Hammons
8df5d53bb8
Refs #24235
2015-06-10 09:45:03 -06:00
Joe Julian
9cb7015568
Mark keyword version adds
2015-06-09 12:50:24 -07:00
Joe Julian
76e2583265
Merge tls changes from develop
2015-06-09 12:48:36 -07:00
C. R. Oldham
d236fbd38f
Merge pull request #24504 from rallytime/move_vsphere_deprecation_2015.5
...
Move vsphere deprecation to 2015.5
2015-06-08 16:43:05 -06:00
rallytime
d876535d71
Add Getting Started with VSphere doc to 2015.5
2015-06-08 10:23:47 -06:00
rallytime
b685ebc104
Add vSphere deprecation warnings to 2015.5
2015-06-08 10:22:50 -06:00
Thomas S Hatch
0d9e0c2b8c
Merge pull request #24468 from jacobhammons/doc-fixes
...
Bug fixes and build errors
2015-06-08 09:25:40 -06:00
Alexander Schwartz
7d6b60c79d
change "path" to "name" for "file" operations
...
Path is no supported parameter for any file operation (maybe it has been in the past)
2015-06-07 13:14:26 +02:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
rallytime
70028553c1
yaml indentations should be 2 spaces
2015-06-05 11:21:26 -06:00
Arthur Lutz
21b51abf25
[doc] Alignement fix on external_auth documentation
2015-06-05 11:20:00 -06:00
Jacob Hammons
1f7a13d6f9
Salt cloud doc updates, build errors and bug fixes
...
Refs #24309
2015-06-04 16:42:47 -06:00
Justin Anderson
a6a1f87cd9
Merge pull request #24380 from rallytime/bp-24357
...
Backport #24357 to 2015.5
2015-06-04 14:13:51 -06:00
rallytime
bf85772042
Make sure the parameters are in the correct order
2015-06-04 11:39:39 -06:00
rallytime
9f53809cde
Add "* Change" label parameters
2015-06-04 11:39:39 -06:00
rallytime
b27a15e774
Remove "workaround" wording
2015-06-04 11:39:39 -06:00
rallytime
9fff35a959
Some small fixes
2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6
Link the new labels doc in contributing and hacking docs
2015-06-04 11:39:39 -06:00
rallytime
375695e696
Add pull request label definitions
2015-06-04 11:39:39 -06:00
rallytime
de945638d3
Add Feature Request label definition
2015-06-04 11:39:39 -06:00
rallytime
684f291bd4
Add issue definition and augment functional areas section
2015-06-04 11:39:39 -06:00
rallytime
2da13dd525
Start a "what are all of these labels for?" doc
2015-06-04 11:39:38 -06:00
zhujinhe
f08c875015
fix invoke issues of Jinja Macros example
...
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
2015-06-03 16:38:16 -06:00
rallytime
f5ec1a1693
Add 2015.5.2 release notes
2015-06-03 13:27:17 -06:00
rallytime
a235b114d7
Remove references to mount_points in ec2 docs
...
Fixes #14021
2015-06-02 16:32:26 -06:00
Joseph Hall
ca535a6ff4
Add warning about destroying maps
2015-06-01 15:25:58 -06:00
Jason Thigpen
beff7c7785
Correct usage of import_yaml in formula documentation
2015-05-31 09:43:15 -06:00
Colton Myers
669938f28d
s/you ll/you'll/
2015-05-29 16:53:37 -06:00
Colton Myers
75590cf490
Merge pull request #24080 from makinacorpus/lxc_consistency2
...
Lxc consistency2
2015-05-29 16:51:54 -06:00
rallytime
8d51f75aa5
Clarify digital ocean documentation and mention v1 driver deprecation
...
Fixes #21498
2015-05-29 14:14:19 -06:00
Colton Myers
e5ba31b5b5
2015.5.1 release date
2015-05-28 10:19:47 -06:00
Colton Myers
768494c819
Update latest release in docs
2015-05-28 10:19:00 -06:00
Tyler Cipriani
db793dd0de
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 21:56:29 -06:00
rallytime
d8daa9dcd7
Merge #24185 with a couple of fixes
...
Refs #24185
2015-05-27 15:25:27 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Colton Myers
7dfbd929ff
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-26 15:51:15 -06:00
Justin Findlay
67c4373577
Merge pull request #24135 from rallytime/bp-24083
...
Backport #24083 to 2015.5
2015-05-26 09:58:27 -06:00
thanhnt
e1d06f9764
fix code block syntax
2015-05-26 08:57:46 -06:00
