Tom Melendez
c8e7b8fb7e
added message recommending JSON file be used if the libcloud version is >= 0.17.0
2015-06-30 19:29:22 +00:00
Thomas S Hatch
337a5fe4e9
Merge pull request #24980 from UtahDave/templatize_winrepo
...
Templatize winrepo on the minion
2015-06-29 09:44:49 -07:00
Joseph Hall
64cdd85584
Merge pull request #25023 from pengyao/schedule_typo
...
fixed a typo
2015-06-28 07:25:48 -06:00
pengyao
083f879afd
a typo
2015-06-28 20:27:49 +08:00
Arnold Bechtoldt
689ba5686b
add missing module documentation to references
2015-06-27 19:12:50 +02:00
Jacob Hammons
30a907576c
rebuilt man pages, versioned html theme css
2015-06-26 11:06:21 -06:00
David Boucha
99d2fd109a
update docs to reflect new win rep changes
2015-06-26 09:58:47 -06:00
Jacob Hammons
1587d56bf0
Fixed doc/index.rst
2015-06-26 08:44:14 -06:00
Jacob Hammons
8be40d9d40
sphinx html theme updates - additional fix, updated index file
2015-06-26 08:35:20 -06:00
Jacob Hammons
01e96bca11
sphinx html theme updates - color changes for warning on development branch
2015-06-26 08:23:58 -06:00
Nicole Thomas
a15f9f8b56
Merge pull request #24971 from rallytime/azure_min_ver
...
Add minimum Python Azure SDK version to azure docs.
2015-06-25 17:18:22 -06:00
Colton Myers
f65e663353
Merge pull request #24937 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-25 16:03:47 -06:00
Mike Place
fbea069319
Remove duplicate func doc
...
Closes #23613
2015-06-25 15:48:44 -06:00
rallytime
4ac8a9460a
Add minimum Python Azure SDK verion to azure docs.
2015-06-25 15:26:50 -06:00
Colton Myers
acb7c6f52b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/minion.py
salt/modules/network.py
salt/utils/cloud.py
salt/utils/job.py
2015-06-24 11:44:04 -06:00
Thomas S Hatch
d63006773d
Merge pull request #24916 from daodennis/patch-1
...
broken link, adding /en/latest
2015-06-24 10:39:17 -06:00
Justin Findlay
fc405bc0ee
Merge pull request #24917 from daodennis/patch-2
...
s/respctively/respectively
2015-06-24 09:15:41 -06:00
Julien Barbot
6d7e779e62
Fix typo in salt-cloud reactor section
2015-06-24 16:40:32 +02:00
Dennis
9081a7d391
s/respctively/respectively
2015-06-23 18:24:06 -07:00
Dennis
8ada53c7cc
broken link, adding /en/latest
...
http://docs.saltstack.com/index.html#configuration-management -> http://docs.saltstack.com/en/latest/index.html#configuration-management
2015-06-23 18:02:15 -07:00
Joseph Hall
32c158892b
Adding docs for SPM
2015-06-23 12:06:47 -06:00
C. R. Oldham
90c73ff446
References to documentation.
2015-06-23 11:40:06 -06:00
C. R. Oldham
9da96a8b95
Docs
2015-06-23 11:06:12 -06:00
rallytime
9b4b6bce64
Add rest api change to release notes
2015-06-19 16:21:24 -06:00
rallytime
b3ef394abe
Clean up
2015-06-19 16:17:56 -06:00
rallytime
ddab875177
Update linode rest driver docs
2015-06-19 16:15:13 -06:00
rallytime
e2684ecf0b
Add notes to map and gogrid docs -- don't use -P with map files
2015-06-19 11:02:06 -06:00
Joseph Hall
d299475d34
Merge pull request #24796 from rallytime/deprecate_provider_for_driver
...
Deprecate using "provider" in favor of "driver" in cloud provider files
2015-06-19 09:43:26 -06:00
rallytime
5c5dfc557b
More aws --> ec2 references
2015-06-18 16:12:13 -06:00
rallytime
4de5afbe53
Replace references to aws with ec2
2015-06-18 16:06:57 -06:00
rallytime
d045fb579e
Add notes to map and gogrid docs -- don't use -P with map files
2015-06-18 14:25:20 -06:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
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
Damian Myerscough
916519c333
Fixing spacing typo
2015-06-17 14:54:58 -07:00
Michael Steed
f92a769d35
Remove doc references to obsolete minion opt
2015-06-17 15:29:50 -06:00
Mike Place
3ff6eff546
Merge pull request #24632 from jacobhammons/bug-fixes
...
Doc bug fixes
2015-06-17 12:40:02 -06:00
Mike Place
ae65d78cf4
Add Boron release notes
2015-06-17 12:29:49 -06:00
Mike Place
e6dcf3ab12
Merge pull request #24703 from mattmb/fix/onchanges-and-or
...
Multiple onchanges requisite behaviour
2015-06-17 12:26:39 -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
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
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
mattmb
a5607d5e07
Multiple onchanges requisite behaviour
...
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
2015-06-16 15:02:11 +01:00