Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-8.12.x' into candidate…
Browse files Browse the repository at this point in the history
…-9.0.x

Signed-off-by: Gavin Halliday <[email protected]>

# Conflicts:
#	helm/hpcc/Chart.yaml
#	helm/hpcc/templates/_helpers.tpl
#	helm/hpcc/templates/dafilesrv.yaml
#	helm/hpcc/templates/dali.yaml
#	helm/hpcc/templates/dfuserver.yaml
#	helm/hpcc/templates/eclagent.yaml
#	helm/hpcc/templates/eclccserver.yaml
#	helm/hpcc/templates/eclscheduler.yaml
#	helm/hpcc/templates/esp.yaml
#	helm/hpcc/templates/localroxie.yaml
#	helm/hpcc/templates/roxie.yaml
#	helm/hpcc/templates/sasha.yaml
#	helm/hpcc/templates/thor.yaml
#	version.cmake
  • Loading branch information
ghalliday committed Sep 28, 2023
2 parents 809a476 + df067b5 commit 92d46db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion esp/smc/SMCLib/TpWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ void CTpWrapper::getGroupList(double espVersion, const char* kindReq, IArrayOf<I
{
IPropertyTree &group = groups->query();
const char* kind = group.queryProp("@kind");
if (kindReq && *kindReq && !strieq(kindReq, kind))
if (!isEmptyString(kindReq) && !strisame(kindReq, kind))
continue;

IEspTpGroup* pGroup = createTpGroup("","");
Expand Down

0 comments on commit 92d46db

Please sign in to comment.