Skip to content

Commit

Permalink
Merge branch 'sverker/fix-incorrect-since-versions'
Browse files Browse the repository at this point in the history
  • Loading branch information
sverker committed Nov 4, 2024
2 parents 65afbb2 + 28a7a0a commit e6737da
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions lib/kernel/src/net_kernel.erl
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ Returns a list of nodes that are explicitly allowed to connect to the node by ca
[`allow/1`](`allow/1`). If empty list is returned, it means that any node using the
same cookie will be able to connect.
""".
-doc(#{since => <<"OTP @OTP-19287@">>}).
-spec allowed() -> {ok, Nodes} | ignored when
Nodes :: [node()].
allowed() -> request(allowed).
Expand Down
1 change: 1 addition & 0 deletions lib/kernel/src/trace.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,7 @@ Failures:
- **`badarg`** - If the session tracer is not a local process.
""".
-doc #{ since => <<"OTP @OTP-19271@">> }.
-spec system(Session :: session(),
Event :: system_event(),
Value :: system_value()) -> ok.
Expand Down
12 changes: 7 additions & 5 deletions scripts/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -230,18 +230,20 @@ then
exit 1
fi

# Check for fixup! commits
FIXUPS=`git log --format='format:%h: %s' $remote_sha..$local_sha | grep -E '^\w+: fixup!'`
if [ -n "$FIXUPS" ]
# Check for invalid commit messages
INVALID_MSG='(fixup!|squash!|TEST|DEBUG)'
BAD_COMMITS=`git log --format='format:%h: %s' $remote_sha..$local_sha | grep -E "^\w+: $INVALID_MSG"`
if [ -n "$BAD_COMMITS" ]
then
error_color
echo "$0 says:"
echo "***"
echo "*** \"fixup!\" commit found: NOT ALLOWED!!!!"
echo "*** Forbidden commit message found!!!!"
echo "*** Not allowed: $INVALID_MSG"
echo "***"
notice_color
cat <<EOF
$FIXUPS
$BAD_COMMITS
EOF
reset_color
Expand Down

0 comments on commit e6737da

Please sign in to comment.