Erik Johnson
d649551fbf
Merge branch '2015.5' into 2015.5-2015.8
2016-01-24 11:55:09 -06:00
Jacob Hammons
03c51bb54d
Added placeholder release notes for 2015.5.10
...
Changed old doc links from docs.saltstack.org to docs.saltstack.com
2016-01-22 10:48:08 -07:00
Mike Place
15c7aedd46
Merge pull request #30508 from rallytime/linode-clone-fixes
...
Fix Linode driver cloning functionality
2016-01-21 15:53:36 -07:00
rallytime
d26ed74bde
Make sure the correct profile parameters are being checked when cloning
2016-01-21 10:29:48 -07:00
rallytime
1d7e229377
Fix Linode driver cloning functionality.
...
Fixes #30432
Fixes #30444
- Various clean-up of the driver, particularly in the create function.
- Restores cloning functionality, as this was completely broken in 2015.8.3
- Changes the requirement to set a config_id for cloned VMs (not necessary
for clones as the config_id is already set via the to-be-cloned profile)
- Updates docs to use the -F bootstrap script arg in addition to -C when
cloning from a VM that already has salt installed on it.
2016-01-20 17:05:20 -07:00
Tim Harper
721c1c871b
make note of s3 role assumption in upcoming changelog
2016-01-19 20:38:21 -07:00
Colton Myers
5b53bf2597
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/linode.py
salt/states/rabbitmq_policy.py
2016-01-14 16:23:29 -07:00
rallytime
df70afdaa3
Merge #30231 with updates to dependency documentation
2016-01-13 16:41:29 -07:00
Jacob Hammons
53d17f1f85
Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com"
2016-01-12 13:37:09 -07:00
Mike Place
48d2bd9e78
Merge pull request #30303 from jacobhammons/pcre-match
...
Changed notes to indicate that functions are matched using regular ex…
2016-01-12 12:15:16 -07:00
Jacob Hammons
e5079ab4c9
Changed notes to indicate that functions are matched using regular expressions instead of minions
2016-01-12 11:55:36 -07:00
Justin Findlay
22c1129f02
modules.state.sls,highstate: mock versionadded
2016-01-11 14:29:00 -07:00
Justin Findlay
934de30939
add state mock to 2015.8.4 release notes
2016-01-11 14:24:51 -07:00
Justin Findlay
741f7aba31
add 2015.5.9 release notes
2016-01-08 16:08:03 -07:00
Jacob Hammons
0d2111d397
Assorted doc bug fixes
...
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
2016-01-07 14:08:30 -07:00
Colton Myers
d73a7d6c4d
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/ssh/index.rst
2016-01-05 16:11:20 -07:00
Stanislav Blokhin
d81f6f7206
Fix typo in gpgkey URL
...
Fixes following error on yum update:
Retrieving key from
https://repo.saltstack.com/yum/redhat/6/x86_64/latest/$releaseverSALTSTACK-GPG-KEY.pub
GPG key retrieval failed: [Errno 14] PYCURL ERROR 22 - "The requested
URL returned error: 404 Not Found"
2016-01-04 16:43:19 +01:00
Mike Place
040412b0b1
Merge pull request #30093 from zmalone/pillar-notes
...
Noting that file_roots and "state tree" should both be avoided
2015-12-30 15:40:05 -07:00
Zach Malone
cfbfd58afe
Noting that file_roots and "state tree" should both be avoided, because in some
...
environments, the actual states show up another level down. Adding notes about why this is undesirable.
2015-12-30 13:10:46 -07:00
Mike Place
8c29e2dd6a
Document that gitfs needs recent libs
...
Closes #29921
2015-12-30 12:00:33 -07:00
Mike Place
60431e342a
Add documentation on debugging salt-ssh
...
Closes #27835
2015-12-29 15:22:03 -07:00
rallytime
6176f383e5
Spelling fixes
2015-12-29 11:57:18 -07:00
rallytime
83c05729d6
Add Syndic documentation to miscellaneous Salt Cloud config options
...
Fixes #30045
2015-12-29 11:53:49 -07:00
Mike Place
9e385369b7
Merge pull request #30034 from rallytime/bp-29893
...
Back-port #29893 to 2015.8
2015-12-28 13:20:51 -07:00
Aditya Kulkarni
2fcf1590b8
Add info about VolumeType
2015-12-28 12:27:45 -07:00
rallytime
a257249789
Add versionadded to SSH Port docs
2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa
Updated Cloud msic section.
...
Added ssh_port section.
2015-12-28 12:11:16 -07:00
Jonathan Ballet
5aa0e9b1e0
Fix documentation typo for pillars
2015-12-21 13:26:02 +01:00
Jonathan Ballet
f2b41d04d7
Fix rendering issues for Cherrypy netapi documentation.
2015-12-21 13:26:02 +01:00
Jonathan Ballet
6922da46dc
doc: fix warnings + some rendering issues
2015-12-21 13:26:02 +01:00
Mike Place
7eefaac58a
Merge pull request #29814 from basepi/multi-master.windows.29396
...
[2015.8][Windows] Fix multi-master on windows
2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645
Merge pull request #29819 from rallytime/esxi-docs
...
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
rallytime
e7c5863468
Add esxi module and state to docs build
...
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75
Add documentation for tcp ipc_mode and multi-master
2015-12-17 14:08:41 -07:00
Mike Place
c4f226f31e
Merge pull request #29773 from l2ol33rt/debian_install_docfix
...
Append missing wget in debian installation guide
2015-12-17 10:29:18 -07:00
Aditya Kulkarni
10bfcb8cb0
Add documentation about scopes (GCE)
2015-12-17 09:42:15 -07:00
Robert James Hernandez
64cb4b0540
Append missing wget in debian installation guide
2015-12-16 13:44:35 -08:00
rallytime
45080f3629
Add examples of using multiple matching levels to Pillar docs
...
Fixes #29091
2015-12-15 14:57:36 -07:00
Colton Myers
b51cba59c0
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-12-14 15:44:21 -07:00
Mike Place
fe0778dad5
Merge pull request #29644 from rallytime/esxi-fixes
...
Fixed a couple more ESXi proxy minion bugs
2015-12-14 11:36:28 -07:00
rallytime
577d5487a3
Fixed a couple more ESXi proxy minion bugs
...
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
2015-12-11 16:16:25 -07:00
Colton Myers
0afa5b0d5d
Add cmd_umask to roster docs
2015-12-10 14:51:43 -07:00
rallytime
5a2bb260d3
Added ESXi Proxy Minion Tutorial
...
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
2015-12-09 18:00:20 -07:00
Joe Healy
b96d8ff1d9
Minor update to release notes for missing fix
...
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4
Fix typo specfic -> specific
2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762
Fix typo comparsion -> comparison
2015-12-09 12:17:49 +01:00
Mike Place
25d3a75d8c
Merge pull request #29540 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-08 14:27:01 -07:00
Mike Place
f77c8e7baf
Merge pull request #29527 from jfindlay/2015.5
...
2015.5.7 notes: add note about not being released
2015-12-08 14:08:26 -07:00
Colton Myers
9673fd0937
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/ec2.py
tests/unit/states/file_test.py
2015-12-08 12:23:26 -07:00
Mike Place
de7f3d5a59
Merge pull request #29504 from rallytime/fix-12072
...
Document userdata_file option for EC2 driver
2015-12-08 09:54:33 -07:00
