tree 91f7133e5ab50523a08e8fd54622aa0a916865fa
parent 7ce72d33444e93d0ac0d30b634112009ebbd52c3
parent 31f17c92c9d34c9fc6795251a7232c82a5338d4f
author David Ostrovsky <david@ostrovsky.org> 1612715763 +0100
committer David Ostrovsky <david@ostrovsky.org> 1612716327 +0100

Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Patch rules_nodejs library to fix wrong regex string escape
  Bump Bazel version to 4.0.0
  MultiBaseLocalDiskRepositoryManagerTest: fix for running on Mac from Eclipse

The change Ia99ea8398e is reverted during this merge, because the used
rules_nodejs version was upgraded and the workaround is not needed any
more.

Change-Id: I593d4e1711ca5618f03ada0ed47f93ab1189c59f