Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11000 Update numFilesToProcess when removing a file from todo

Incorrect NumFilesToProcess is found in ESP Roxie metrics. This fix
decrements the numFilesToProcess when removing a file from todo queue.
Merge pull request #5523 from wangkx/h11000a

HPCC-11000 Update numFilesToProcess when removing a file from todo

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
EPE-102 DOCS:Update to ECL Plug-in for Eclipse doc

Fix EPE-102 DOCS:Update to ECL Plug-in for Eclipse doc
Update documentation for running ECL Plug in
for Eclipse using Eclipse Kepler.

Signed-off-by: g-pan <greg.panagiotatos@lexisnexis.com>
EPE-102 DOCS:Update to ECL Plug-in for Eclipse doc

Fix EPE-102 DOCS:Update to ECL Plug-in for Eclipse doc
Update documentation for running ECL Plug in
for Eclipse using Eclipse Kepler.

Signed-off-by: g-pan <greg.panagiotatos@lexisnexis.com>
Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5567 from g-pan/E102-EPEUpdate3-14

EPE-102 DOCS:Update to ECL Plug-in for Eclipse doc

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-4.2.4' into closedown-4.2.x
Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9129 DOCS:Ganlia

Fix HPCC-9129 DOCS:Ganlia
Provide documentation about Ganglia
and HPCC Reporting.
Renamed xml file.

Signed-off-by: g-pan <greg.panagiotatos@lexisnexis.com>
Merge pull request #5727 from g-pan/H9129-Gang1ia

HPCC-9129 DOCS:Ganglia
Merge remote-tracking branch 'origin/candidate-4.2.4' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Split off candidate-4.2.6 branch

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11278 Fix core when calling WUListQueriesUsingFile with LDAP

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
HPCC-11187 ecl-queries-list should show wuid and snapshot info

Add wuid and snapshot info to the output of ecl-queries-list.

Reformat output to be more readable and extensible.

For performance reasons snapshot will only show up for queries published
after the build containing this change in installed.

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Merge pull request #5759 from afishbeck/queriesListWuidAndSnapshot

HPCC-11187 ecl-queries-list should show wuid and snapshot info

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5757 from afishbeck/fileUsedByQueriesLdapCore

HPCC-11278 Fix core when calling WUListQueriesUsingFile with LDAP

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>