# Conflicts:
#   mlair/run_modules/post_processing.py

Resolve "Load data from ToarDB V2"

See merge request !440

Develop

See merge request !442

Resolve "climateFIR empty data after sel_opts"

See merge request !441

removed network parameter, toar_data loads from both v2 and v1 and combines data, data is now in local time (without DST), data handler now raises error when no data intersection is available

first implementation of toar-data-v2, can load data (but cannot process these for now), savepoint, #396

Resolve "Bug for long competitor series"

See merge request !439

Master

See merge request !436

Release v2.1.0

See merge request !435

Develop

See merge request !434

use git describe with match flag

See merge request !433

Resolve "release v2.1.0"

Closes #328, #380, #381, #385, and #391

See merge request !431

IOA works now also with xarray and on identical data, IOA is included in...

See merge request !432

Resolve "parallel make_prediction in postprocessing"

See merge request !427

revert many changes as multiprocessing approach will not work on HPC system with really big data due to memory issues