Pre-SaltConf changes
Pre-SaltConf patches.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Logging
Wait for explicit minions in gather job info

Improves syndic case because gather job info doesn't exit quickly
thinking it's found all minions before syndic has responded
Less hacky? way of passing known minions around

Gets of the known_minions arg on cmd to have gather_job_info do more
work
Loosen regex to allow for quoting quirk on Ubuntu 10.x
Tighten up regex a bit
Merge branch 'develop' of github.com:saltstack/salt into develop
Changes to the proxy minion, add release notes, remove REST server (move to separate repo)
Fix release notes.
Handle yum edge case

Handle edge case where there are extra lines in the repoquery output.
Show and kill stalled states jobs when running the tests.
[Salt-cloud] Add function for checking libcloud versions.

Everything else should need 0.13.2, but rackconnect will need 0.14.0.
Add a function to make custom requirements for libcloud as you would
need them.
[Salt-cloud] use list_nodes_full for extra dict

Rackconnect and ManagedCloud require the extra dict in the node data.  I
have also added the default options for those because the values are
not set immediately.
Add info about root_dir and the options to which it is prepended
Fix cron state to work on SmartOS

SmartOS and Solaris are both in the Solaris os_family
If we use that grain, the module should work on SmartOS
Merge pull request #10184 from gtmanfred/develop

[salt-cloud] rackconnect and managedcloud fix
Rename apt to aptpkg in sphinx configuration