HPCC-8576 Document Thor Memory settings

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>
HPCC-8576 Edits based upon feedback

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>
HPCC-8576 Edits from Feedback

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>
Merge pull request #6601 from JamesDeFabia/8576DocsThorMemory

HPCC-8576 Document Thor Memory settings

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11632 Add serverType attribute to LDAP config

	- Add serverType to dali.xsl
	- Add serverType to esp_service.xsl

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
HPCC-12543 Create the deserializer object in the correct context

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
HPCC-11960 Regression suite Wild card oddity

Add fix to handle files without '.ecl' extension.

Signed-off-by: Attila.Vamos <attila.vamos@gmail.com>
Merge pull request #6612 from AttilaVamos/HPCC-11960-fix

HPCC-11960 Regression suite Wild card oddity

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #6614 from ghalliday/issue12543

HPCC-12543 Create the deserializer object in the correct context

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-12534 Fix regression introduced in last commit for this issue

SDS didn't like 0 timeout on a connect.
changeMode was fine, and is used to establish the exclusive lock
for a file after it has looked it up in non-exclusive mode.
However, DFS also updates the FS to remove empty scopes, which
with the previous change was using a connect with a 0 timeout and
failing, due to a spurious check before it had tried.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #6619 from jakesmith/hpcc-12534b

HPCC-12534 Fix regression introduced in last commit for this issue

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.12-rc2 Release Candidate-2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-4.2.12' into candidate-5.0.4

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-5.0.4'

Conflicts:
	initfiles/componentfiles/configxml/ldapserver.xsd

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>