Merge trilinos-release-12-6-branch into master
Created by: bartlettroscoe
@trilinos/amesos2, @trilinos/rol, @trilinos/zoltan2, @trilinos/teko, @trilinos/tpetra, @trilinos/zoltan, @trilinos/framework,
This is the merge of the trilinos-release-12-6-branch branch into the master branch. I resolved merge conflicts in packages/rol and packages/zotlan2 by selecting what was on 'master'. Please take a look at these changes to your packages and see if they are okay to make. I would really like to push this so that we can use the merging workflow for release branches.
See:
Doing a big merge like this is very dangerous. It is much better to do the merges in small increments. Basically, every time you update the release branch, you should merge the release branch forward (ending with the master branch and soon to be the develop branch).