Merge released '4.x'

2017-12-28 17:15:29 -06:00 · 2017-12-28 17:15:29 -06:00 · 66ca61f636
parent e614e9b732 c681c7881d
commit 66ca61f636
2 changed files with 3 additions and 3 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,7 +1,7 @@
 PATH
  remote: .
  specs:
-    metasploit-framework (4.16.27)
+    metasploit-framework (4.16.28)
      actionpack (~> 4.2.6)
      activerecord (~> 4.2.6)
      activesupport (~> 4.2.6)
@ -104,7 +104,7 @@ GEM
    arel (6.0.4)
    arel-helpers (2.5.0)
      activerecord (>= 3.1.0, < 6)
-    backports (3.10.3)
+    backports (3.11.0)
    bcrypt (3.1.11)
    bcrypt_pbkdf (1.0.0)
    bindata (2.4.1)
--- a/lib/metasploit/framework/version.rb
+++ b/lib/metasploit/framework/version.rb
@ -30,7 +30,7 @@ module Metasploit
        end
      end

-      VERSION = "4.16.27"
+      VERSION = "4.16.28"
      MAJOR, MINOR, PATCH = VERSION.split('.').map { |x| x.to_i }
      PRERELEASE = 'dev'
      HASH = get_hash