Merge branch 'master' into next

[rails.git] / db / migrate / 20120208122334_merge_acl_address_and_mask.rb

diff --git a/db/migrate/20120208122334_merge_acl_address_and_mask.rb b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
index 9153da1e5ab87680765764c0236858cdaf587175..1e67f46dd98370aa32cb069106c33ae6d42b708a 100644 (file)
--- a/db/migrate/20120208122334_merge_acl_address_and_mask.rb
+++ b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
@@ -10,7 +10,7 @@ class IPAddr
   end
 end
 
-class MergeAclAddressAndMask < ActiveRecord::Migration
+class MergeAclAddressAndMask < ActiveRecord::Migration[5.0]
   def up
     Acl.find_each do |acl|
       address = IPAddr.new(acl.address)