adding modjk state
Try to catch errors and sleep between `tx` calls
Merge pull request #10168 from s0undt3ch/develop

Try to catch errors and sleep between `tx` calls
added show global/variables
show variables, show global lint correction
Remove deleted resources.
Use `sys.stdout.write()` instead of `print()`.
According to the SunOS man page on flock:

	flock() applies or removes an advisory lock on the file associ-
     ated with the file descriptor fd. The compatibility version of
     flock() has been implemented on top of fcntl(2) locking.  It does
     not provide complete binary compatibility

This lack of binary compatibility results in some odd behavior when
running salt-master on a SunOS/SmartOS host. Specifically an IOError
[Errno 9] is thrown whenever the master calls the file_hash method.

Specifically it has to do with the fact that on SunOS/SmartOS the lock
is released when the file is closed,  whereas in Linux the lock is kept
until it is released. An article discussing the problem in detail can be
found here:

http://infinitesque.net/articles/2010/on%20Python%20flock/index.html

To get this working I changed salt/fileserver/roots.py to check os.uname()
to make sure it's not a SunOS host when setting HAS_FCNTL. Comments indicate
Windows shouldn't have this set either.
Merge pull request #10171 from s0undt3ch/develop

More doc translations stuff
Include new docs to translate
Merge pull request #10172 from s0undt3ch/develop

Include new docs to translate
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
Merge pull request #10161 from tedski/10107

Automatically resolve dependencies when sourcing a deb file.
Merge pull request #10093 from zmcneilly/fix-solaris-fcntl

fcntl incompatibility when using SunOS/SmartOS as a host
Merge pull request #10146 from ticosax/trigger-update-of-states

Improve detection of changes when pull or build an image
Merge pull request #10165 from joehealy/rename_js_file

Rename js file to make minified file relationship clear
Merge pull request #10170 from krazybean/develop

added show global/variables