# Conflicts:
#	atdb/taskdatabase/templates/taskdatabase/index.html

Ingestq filter

See merge request !336

handling review comments

See merge request !335

updates after demo to SDCO

See merge request !334

# Conflicts:
#	atdb/taskdatabase/templates/taskdatabase/index.html

merge master changes in to branch

See merge request !332

missed a bit

See merge request !331

still a bug

See merge request !330

Solving Feature SDCP-239

See merge request !328

re-order columns

do not change sas_id priority for discarded and suspended tasks

adding additional statusses

adding additional statusses

add filter buttons to Failures page