Merge pull request #1847 from wangkx/gh1663

Fix gh-1663 Display component name for thorslaves

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Update VERSIONS to remove references to split-X.Y branch

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Move package code to community release

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
Fix some build errors on Mac OSX from recent changes

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

Adding back in Cherry picked missing commit. 8ef991ac

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Merge pull request #1852 from pschwartz/docMissing

Doc changes that are missing

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1851 from richardkchapman/mac-build-errors

Mac build errors

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #1849 from hpcc-systems/candidate-3.6.x

Merge latest 3.6.x fixes back into master

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Fix 'Page Not Found' error when change password

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Merge pull request #1857 from wangkx/gh1856

Fix 'Page Not Found' error when change password

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1854 from stuartort/CE-pkg

Move package code to community release

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1859 from hpcc-systems/candidate-3.6.x

Merge latest 3.6 changes back to master

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
gh-1646 - Roxie groups only updated on new env.

Thor cluster groups are only updated if the environment is detected to be
different from both the old environment and the live group.
This was disabled for roxie cluster/groups, i.e. the loaded environment
always too precedence.

This change treates roxie cluster group updates in the same way as thor
cluster group updates.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #1863 from jakesmith/gh-1646b

gh-1646 - Roxie groups only updated on new env.

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
gh-1822 - Fix xref attach/remove files

Some legacy code was inserting a spurious head path onto part mask, causing
reattached files to be invalid.
Was also effecting the deletion of orphaned files.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
gh-1865 Roxie can core when query deployed

A race condition between the control:reload query sent by ecl publish,
and the automatic reload triggered by the dali subscription, can cause
Roxie to core if the notify call is in progress when the QuerySet manager
is destroyed by the control:reload

Add a critical section so that a we never unsubscribe when a notify is
in flight.

Also deleted an unused member variable. Fixes gh-1865

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1866 from jakesmith/gh-1822

gh-1822 - Fix xref attach/remove files

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Grouped HashAggregate deserialization error

Exposed by change in gh-1476.
That stopped the unecessary seralization from master to slave for local or
grouped hash aggregragtes, but the slave was still trying to deserialize if
grouped.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #1867 from richardkchapman/roxie-reload-core

Roxie reload core

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #1850 from richardkchapman/branching-strategy

Update VERSIONS to remove references to split-X.Y branch

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>