Merge branch 'master' of ingwe.cs.wisc.edu:/p/condor/repository/CONDOR_SRC
Fix socket leak in NODNS code. #4140
Merge branch 'V8_0-branch'
add configuration and assignment of non-fungible user-defined resources #4141
User defined resources like MACHINE_RESOURCE_GPU now accept an enumerated
list of IDs OR a count of available resources, when a count is used, then
the resource is considered fungible, but when a list of ids is used, the
number of ids is the count, and specific ids are assigned to slots when the
resource is used.  With this patch MACHINE_RESOURCE_INVENTORY_GPU does not
yet support enumerated ids.  This patch also corrects case-sensitivity problems
with the implementation of user-defined resources.
===VersionHistory:Pending===
fix BOOST_NOTHROW warnings in unit tests.
===VersionHistory:None===
fix warnings found by Visual Studio 2012 analysis
===VersionHistory:None===
(#4133)  React appropriately when an attempt to terminate a purged instance fails.
Also fixes a bug in the CANCEL/CANCEL_CHECK loop that would allow the polling
delay to be incorrectly bypassed.
Fix RPATH for python modules. #4128
fix MSVC warnings
===VersionHistory:None===
Fix definition of RPATH on Mac OS X for python bindings. #4128
(#4113) Request a ping of the resource when a command fails with E_CURL_IO.
(#4113) Document EC2_RESOURCE_TIMEOUT.
Make python bindings compatible with python3. #4146
(#4133) Documentation.
IPv6 socket shouldn't also grab IPv4 #3982
(#3867) Detect held jobs and stop trying to SSH to them.
Consolidate all socket keepalive handling in CEDAR in one place. #4122
Added Windows function GetLastErrorString() in util lib. #4122

Finally a util lib function for Win32 to get an error string returned in
a static buffer (like strerror) so it is easy to use in dprintf
messages.  Note this is for Win32/Winsock errors, not C library
errnos - for C library errno calls, use strerror() as usual.
Add support for TCP_KEEPALIVE_INTERVAL on Windows. #4122
Set TCP_USER_TIMEOUT to help close dead tcp sockets. #4122

Use TCP_USER_TIMEOUT, which is amount of time before an ack
must be received for sent data, to make sure the connection fails in a
reasonable amount of time even if there is traffic on it.