Add `salt/ext/six.py` to COPYING
Move `salt.utils.ipaddr` to `salt.ext.ipaddr`
Fix issue where startup of salt-master printed out "WARNING: Mixing fork() and threads detected; memory leaked."

c2e96e moved the init of various classes around. While doing so all of the module class init was moved into the parent process (pre-fork), which means that if any modules create threads we will leak memory (at least)
Add note about libssh2 optdepend for ssh access w/libgit2

See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #18245 from s0undt3ch/hotfix/merge-18194

Move `salt.utils.ipaddr` to `salt.ext.ipaddr` &  	Add `salt/ext/six.py` to COPYING
Merge pull request #18246 from jacksontj/develop

Fix issue where startup of salt-master leaks memory
Merge pull request #18247 from terminalmage/docs

Add note about libssh2 optdepend for ssh access w/libgit2
Add a note explaining salt/ext
Merge pull request #18261 from cachedout/ext_note

Add a note explaining salt/ext
State `debconf.set_file` now accepts a template as a file

It follows the same convention as `file.managed` for example.

This also introduces a new function in the `debconfmod` module to set the
Debconf selections from a template or, as before, from a simple file.

Fixes #7331
Cleaning up lint
Removing unused import
Fix undefined _error() function, thanks to Pylint
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
Use shlex_quote from six
Merge pull request #18270 from jmdcal/develop

fixed confusion