Merge pull request #1487 from richardkchapman/build-break

Build break

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #1421 from jakesmith/buildmismatch

Protect against mismatched master and slave builds

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1491 from richardkchapman/roxie-queries-gh1460

gh-1460 Roxie should indicate suspended in control:queries

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #1501 from ghalliday/linkopt

Fixed gh-1426 preserve -Wl, for gcc and add options after object

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1503 from jakesmith/dynamicgroup-3.6

gh-1492 - Change the way Thor fetches it's group

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'publish_reload' of https://github.com/afishbeck/HPCC-Platform into afishbeck-publish_reload

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1508 from jakesmith/swapnode-3.6

gh-1412 - Rework swapnode for OSS

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1510 from jakesmith/swapnode-3.6-v2

gh-1412 Fix linux compile issue and amend comment

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1511 from jakesmith/swapnode-3.6-v3

gh-1412 - Make slave script independent of init

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
add ecl-queries copy command

Copies a query from one queryset to another.  Source queryset can be
from a remote environment.

Usage:

ecl queries copy <from querypath> <to queryset> [--activate]

 Options:
   <from querypath>       path of query to copy
                          format: [//ip:port/]queryset/query
   <to queryset>          name of queryset to copy the query into
   -cl, --cluster         Local cluster to associate with remote workunit
   -A, --activate         Activate the new query
   --wait=<ms>            Max time to wait in milliseconds
 Common Options:
   -v, --verbose          output additional tracing information
   -s, --server=<ip>      ip of server running ecl services (eclwatch)
   --port=<port>          ecl services port
   -u, --username=<name>  username for accessing ecl services
   -pw, --password=<pw>   password for accessing ecl services


Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Merge pull request #1525 from smeda/issue1520

Fixes #1520 Check for null object before accessing it

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1518 from jakesmith/backupnode-fixes

Make backupnode not require slaves files on slaves

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1527 from jakesmith/aggr-restart-fix

Fix potential aggregate child query issue

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1532 from ghalliday/aggregatebug

Fix mergeTransform not generated for compound source

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1534 from ghalliday/thorloopresult

gh-1375 Unconditional graphid generation

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1536 from jakesmith/gh-1375

gh-1375 - Use new graphId to retreive correct graph loop results

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1516 from wangkx/swap_test

Update EclWatch UI to reflect swap node scheme

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1522 from afishbeck/copy_queries

add ecl-queries copy command

Reviewed-By: Stuart.Ort <stuart.ort@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1541 from wangkx/external_node_display

Show correct node information for external node

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1540 from pschwartz/doctest_import

WIP: doc import from internal svn.

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>