Update docs to 2014.1.6 release
Update docs to 2014.1.7 release
Merge branch 'develop' into solaris-smf-fmri
smf.py: use FMRI instead of SVC in Solaris svcs commands
Portfile and .plist files for MacPorts
Started refactor to integrated SaltKeep from SaltSafe
Merge remote-tracking branch 'upstream/develop' into solaris-smf-fmri
modules.zypper: add get_repo and list_repo (via libzypp)
modules.zypper: add del_repo
modules.zypper: add RepoInfo class to encapsulate zypp.RepoInfo
modules.zypper: add mod_repo (without adding functionality)
modules.zypper: mod_repo: add create functionality
modules.zypper: mod_repo: fix docstrings
modules.zypper: fix emtpy url handling
modules.zypper: underscore RepoInfo
ec2.query: handling the case where requesturl is passed in
Added support to manage bans and params

* Added support for ban and ban.list
* Added support for param and param.show
* Added support to obtain complete version of varnishd (incl commit
  hash)
* Simplified purge function to use recommended Varnish 4.x syntax that
  actually works in Varnish 3.x
* Dropped support for Varnish 2.x in purge (actually it's pretty old and
  unrecommeded)
add sphinx spelling extension. enforce en_us
minor
lxc: Conservative and explicit network type change

This refs #14192 and replaces it.