add grain that detects SSDs
remove duplicated code and warn when master IP changes
Fix traceback in salt.utils.network.get_fqhostname

This traceback occurs when the lookup fails in some way, raising an
exception.
states.file: avoid shadowing prepend() func

************* Module salt.states.file
salt/states/file.py:2644: [W0621(redefined-outer-name), prepend] Redefining name 'prepend' from outer scope (line 2545)
modules.ipset: fix typo: "creatd" => "created"
Merge pull request #11689 from hulu/ipset-creatd-typo

modules.ipset: fix typo: "creatd" => "created"
Merge pull request #11688 from hulu/file-prepend-shadowing

states.file: avoid shadowing prepend() func
Be consistent and show python mapping for "Dashes"
Merge pull request #11692 from anonymouz/patch-1

Be consistent and show python mapping for "Dashes"
Check file hash for the installer

Checks to make sure the cached file is updated to the latest version or
not
Cache the results for the jid using salt-ssh
Randomize minion reconnects by default
Make sure line isn't too long
Fixed problem where message transactions on unallowed estates raising exception
Now silenty drops transaction

Fixed for all transactions similar issues
Merge remote-tracking branch 'upstream/develop' into sam_raet_32
Merge pull request #11698 from SmithSamuelM/sam_raet_32

Fixed transactions so do not raise exception is unjoined or unallowed but drop transaction
Replace / division with // division for future compatibility
Switch ec2 and s3 from urllib2 to requests
Switch digital ocean from urllib2 to requests
Switch joyent from urllib2 to requests, remove deprecated query code