Skip to content

Merge dev to master for 9.2.0 release#1506

Merged
peterbae merged 11 commits intomasterfrom
dev
Jan 29, 2021
Merged

Merge dev to master for 9.2.0 release#1506
peterbae merged 11 commits intomasterfrom
dev

Conversation

@peterbae
Copy link
Copy Markdown
Contributor

No description provided.

@peterbae peterbae merged commit 66ee808 into master Jan 29, 2021
peterbae added a commit that referenced this pull request Jan 29, 2021
Merge dev to master for 9.2.0 release (#1506) (#1507)
tkyc pushed a commit that referenced this pull request Dec 14, 2022
* Merge dev to master for 9.2.0 release (#1506)

Merge dev to master for 9.2.0 release (#1506)

* fix merge

* Fix #1964 by not having a static field at all. It was cleared each time anyway.

* refactor a bit

Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>
tkyc pushed a commit that referenced this pull request Dec 14, 2022
* Merge dev to master for 9.2.0 release (#1506)

Merge dev to master for 9.2.0 release (#1506)

* fix merge

* Fix #1964 by not having a static field at all. It was cleared each time anyway.

* refactor a bit

Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>
tkyc pushed a commit that referenced this pull request Dec 28, 2022
* Merge dev to master for 9.2.0 release (#1506)

Merge dev to master for 9.2.0 release (#1506)

* fix merge

* Fix #1964 by not having a static field at all. It was cleared each time anyway.

* refactor a bit

Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>
tkyc pushed a commit that referenced this pull request Dec 29, 2022
* Merge dev to master for 9.2.0 release (#1506)

Merge dev to master for 9.2.0 release (#1506)

* fix merge

* Fix #1964 by not having a static field at all. It was cleared each time anyway.

* refactor a bit

Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>
tkyc added a commit that referenced this pull request Dec 29, 2022
* Merge dev to master for 9.2.0 release (#1506)

Merge dev to master for 9.2.0 release (#1506)

* fix merge

* Fix #1964 by not having a static field at all. It was cleared each time anyway.

* refactor a bit

Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>

Co-authored-by: Milan Mimica <[email protected]>
Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>
Jeffery-Wasty pushed a commit that referenced this pull request Mar 14, 2023
* Merge dev to master for 9.2.0 release (#1506)

Merge dev to master for 9.2.0 release (#1506)

* fix merge

* Fix #2084 by not using double-lock check.

* Simplify the test a bit.

* Simplify the test a bit.

* test rewritten for old compatibility

---------

Co-authored-by: ulvii <[email protected]>
Co-authored-by: Peter Bae <[email protected]>
Co-authored-by: Milan Mimica <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants