rallytime
404268286a
Add provider --> driver change to release notes
2015-06-18 10:14:02 -06:00
rallytime
0dba3feb63
Change provider config refernces to driver in docs
2015-06-17 16:41:03 -06:00
Mike Place
ae65d78cf4
Add Boron release notes
2015-06-17 12:29:49 -06:00
Mike Place
d877f4f775
Merge pull request #23383 from cachedout/remove_overstate
...
Overstate is dead. Long live orchestrate!
2015-06-17 11:14:52 -06:00
Justin Findlay
4cbef0f7e4
Merge pull request #24735 from notpeter/develop
...
Add 2015.5 codename to version numbers docs
2015-06-16 21:31:08 -06:00
Peter Tripp
05114de3ab
Add codenames for 2015.5 and future versions. Trailing newline.
2015-06-16 18:09:17 -07:00
Nicole Thomas
00916acb6f
Merge pull request #24726 from techhat/gogridip
...
Allow manually assigning IP address
2015-06-16 17:03:48 -06:00
Joseph Hall
b4dd2c40c6
Add versionadded
2015-06-16 15:52:18 -06:00
Joseph Hall
fb7957b730
Update docs for GoGrid
2015-06-16 15:42:40 -06:00
Colton Myers
2ae0d7d302
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/win_file.py
2015-06-16 15:13:53 -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
Mike Place
7dae045b3c
Remove overstate documentation
2015-06-12 13:00:08 -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
725e5c689f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-11 13:15:38 -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
Thomas S Hatch
78a6814351
Merge pull request #24549 from jfindlay/shutdown_time
...
Shutdown time
2015-06-11 10:20:55 -06:00
Jacob Hammons
f3f34ddff6
2015.5.2 release changes
...
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Tim Baker
a39ecc3b99
Add extra clarification why jinja comments are needed.
2015-06-11 04:07:49 -04:00
Tim Baker
e57cdf5c7f
Fix typo
2015-06-11 04:04:21 -04:00
Tim Baker
bbdcc5af01
Add some documentation surrounding Jinja comments - refs #24492 , #21217 , #23359
2015-06-11 03:42:31 -04: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
Justin Findlay
79de6cd477
prefer shutdown timeout value in minutes on windows
...
Fixes #24411 .
2015-06-10 16:21:09 -06:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Nicole Thomas
87e1c6008c
Merge pull request #24459 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-08 22:27:08 -06: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
6c4cef2324
Merge pull request #24478 from nmadhok/vmware-cloud-driver
...
Vmware cloud driver additions and refactors
2015-06-08 09:27:37 -06:00
Nitin Madhok
308681f4ab
Change removed to deprecated
2015-06-07 18:01:25 -04:00
Nitin Madhok
676bf4859c
Add deprecation to beryllium release
2015-06-07 17:58:54 -04:00
Nitin Madhok
ceac83dd59
Deprecating vsphere cloud driver in favor of vmware cloud driver
2015-06-07 17:53:33 -04:00
Nitin Madhok
94ebd4bc63
Show same examples for memory
2015-06-07 04:21:07 -04:00
Nitin Madhok
e7b855f9ca
adding docs for ability to specify memory in mb and gb
2015-06-07 04:18:53 -04: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
Colton Myers
6d503c12ea
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/modules/all/salt.modules.system_profiler.rst
salt/fileclient.py
salt/loader.py
salt/modules/tls.py
salt/modules/win_path.py
salt/states/pkg.py
salt/utils/event.py
salt/utils/pagerduty.py
tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -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
Arthur Lutz
24502e2655
[doc] Alignement fix on external_auth documentation
2015-06-05 12:32:21 +02: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
