Merge remote-tracking branch 'upstream/master' into reload_remove_keys

Consensys · Jan 14, 2025 · 98946d8 · 98946d8
2 parents b8c1ca0 + f8ad155
commit 98946d8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,6 +5,9 @@ Welcome to the Web3Signer repository!  The following is a set of guidelines for
 repo and its packages. These are mostly guidelines, not rules. Use your best judgment, 
 and feel free to propose changes to this document in a pull request.
 
+### Guidelines for Non-Code and other Trivial Contributions
+Please keep in mind that we do not accept non-code contributions like fixing comments, typos or some other trivial fixes. Although we appreciate the extra help, managing lots of these small contributions is unfeasible, and puts extra pressure in our continuous delivery systems (running all tests, etc). Feel free to open an issue pointing any of those errors, and we will batch them into a single change.
+
 #### Table Of Contents
 [Code of Conduct](#code-of-conduct)
 
@@ -246,4 +249,4 @@ These are not strictly enforced during the build, but should be adhered to and c
 [CLA.md]: /CLA.md
 [MkDocs]: https://www.mkdocs.org/
 [How to Write a Git Commit Message]: https://chris.beams.io/posts/git-commit/
-[Chris Beams]: https://github.com/cbeams
+[Chris Beams]: https://github.com/cbeams
diff --git a/acceptance-tests/src/test/resources/log4j2.xml b/acceptance-tests/src/test/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
   <Properties>
     <Property name="root.log.level">DEBUG</Property>
     <Property name="dependency.log.level">WARN</Property>

diff --git a/app/src/main/resources/log4j2.xml b/app/src/main/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
   <Properties>
     <Property name="root.log.level">INFO</Property>
     <Property name="dependency.log.level">INFO</Property>

diff --git a/core/src/integrationTest/resources/log4j2.xml b/core/src/integrationTest/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
   <Properties>
     <Property name="root.log.level">DEBUG</Property>
   </Properties>

diff --git a/signing/src/test/resources/log4j2-test.xml b/signing/src/test/resources/log4j2-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
     <Properties>
         <Property name="root.log.level">DEBUG</Property>
         <Property name="dependency.log.level">WARN</Property>

diff --git a/slashing-protection/referencetests/src/test/resources/log4j2.xml b/slashing-protection/referencetests/src/test/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
   <Properties>
     <Property name="root.log.level">DEBUG</Property>
     <Property name="dependency.log.level">WARN</Property>

diff --git a/slashing-protection/src/integration-test/resources/log4j2.xml b/slashing-protection/src/integration-test/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
   <Properties>
     <Property name="root.log.level">DEBUG</Property>
   </Properties>

diff --git a/slashing-protection/src/test/resources/log4j2.xml b/slashing-protection/src/test/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
+<Configuration level="INFO">
   <Properties>
     <Property name="root.log.level">DEBUG</Property>
   </Properties>