Skip to content

Commit d5ce191

Browse files
Merge branch 'rapid7:master' into master
2 parents 393aed4 + 65c5680 commit d5ce191

File tree

56 files changed

+147
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+147
-131
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# inherit_from: .rubocop_todo.yml
1010

1111
AllCops:
12-
TargetRubyVersion: 2.6
12+
TargetRubyVersion: 2.7
1313
SuggestExtensions: false
1414
NewCops: disable
1515

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
metasploit-framework (6.4.19)
4+
metasploit-framework (6.4.20)
55
aarch64
66
abbrev
77
actionpack (~> 7.0.0)
@@ -29,7 +29,7 @@ PATH
2929
faraday (= 2.7.11)
3030
faraday-retry
3131
faye-websocket
32-
ffi (= 1.16.3)
32+
ffi (< 1.17.0)
3333
filesize
3434
getoptlong
3535
hrr_rb_ssh-ed25519

LICENSE_GEMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ memory_profiler, 1.0.1, MIT
8686
metasm, 1.0.5, LGPL-2.1
8787
metasploit-concern, 5.0.2, "New BSD"
8888
metasploit-credential, 6.0.9, "New BSD"
89-
metasploit-framework, 6.4.19, "New BSD"
89+
metasploit-framework, 6.4.20, "New BSD"
9090
metasploit-model, 5.0.2, "New BSD"
9191
metasploit-payloads, 2.0.166, "3-clause (or ""modified"") BSD"
9292
metasploit_data_models, 6.0.3, "New BSD"

0 commit comments

Comments
 (0)