Add a note explaining salt/ext
Merge pull request #18261 from cachedout/ext_note

Add a note explaining salt/ext
Please pylint

My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.
fixed confusion

Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html

EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.

my-ec2-config:
  # Specify whether to use public or private IP for deploy script
  # private_ips or public_ips
  ssh_interface: public_ips
Release 2014.7.0
Merge pull request #18271 from basepi/release2014.7.0

Release 2014.7.0
Merge pull request #18270 from jmdcal/develop

fixed confusion
Merge pull request #18268 from multani/develop

Please pylint
Use the `skip_if_binaries_missing_helper`
Make salt.fileclient Python3 compatible
Use `urlparse` from six
Use `urlparse` from six
Use `urljoin` from six
Use `urlparse` from six
Use `urljoin` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote` from six