HPCC-7950 Fix minor compile error introduced by previous change

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
HPCC-2951 Docs: HTTPCALL added to LR

Signed-off-by: Richard Taylor <richard.taylor@lexisnexis.com>
Merge branch 'b2951' into candidate-3.10.2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3846 from ghalliday/issue7950b

HPCC-7950 Fix minor compile error introduced by previous change

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8580 Update Version.xml

Fix HPCC-8580 Update Version.xml
which is the config file that all doc builds use
this will ensure all docs now show copyright 2013
This change should be merged into ALL branches, going forward.

Signed-off-by: G Panagiotatos <greg.panagiotatos@lexisnexis.com>
Merge branch 'H-8580-ChDate' into candidate-3.10.2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8254 Ensure child datasets are freed up by compound read activities

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #3848 from ghalliday/issue8254

HPCC-8254 Ensure child datasets are freed up by compound read activities

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8547 - Interleaved mixed width subfiles exposing mapSubPart bug

mapSubPart was testing the wrong subfile when iterating through
parts/subs to determining which subfile and part the logical part index
referred to.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
HPCC-8596 Problems dealing with CSV headers in mixed width supers

When have read all local parts, need to check unsent part header
counts from previous node.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #3849 from jakesmith/mapSubPart

HPCC-8547 - Interleaved mixed width subfiles exposing mapSubPart bug

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3850 from jakesmith/supercsv-header

HPCC-8596 Problems dealing with CSV headers in mixed width supers

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8569 Confimgr - Adding hardware to a blank environment fails

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
HPCC-8197 Configmgr - Rename 'Swap Master' to 'Replace Master'

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Merge pull request #3852 from garonsky/issue-8569_Adding_computer_hardware_fails_in_blank_env

HPCC-8569 Configmgr - Adding hardware to a blank environment fails

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3853 from garonsky/issue-8197_Rename_swap_master_to_replace_master

HPCC-8197 Configmgr - Rename 'Swap Master' to 'Replace Master'

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-3.10.x' into candidate-3.10.2

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

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

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