From ac439852ff7e82716aa28bef913eaf4978dce423 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 12:02:14 +0100
Subject: [PATCH] kernel/v2: allow IPs to end in ".1" [GH-2914]

---
 CHANGELOG.md                   | 1 +
 plugins/kernel_v2/config/vm.rb | 3 ++-
 templates/locales/en.yml       | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8860a423..1331c14e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@ BUG FIXES:
     warn of potential issues.
   - core: Synced folders set to the default synced folder explicitly won't
     be deleted. [GH-2873]
+  - core: Static IPs can end in ".1". A warning is now shown. [GH-2914]
   - commands/box: Box add `--force` works with `--provider` flag. [GH-2757]
   - commands/box: Listing boxes with machine-readable output crash is gone.
   - commands/plugin: Plugin installation will fail if dependencies conflict,
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 9ff14ee46..1daf70073 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -495,7 +495,8 @@ module VagrantPlugins
             end
 
             if options[:ip] && options[:ip].end_with?(".1")
-              errors << I18n.t("vagrant.config.vm.network_ip_ends_in_one")
+              machine.ui.warn(I18n.t(
+                "vagrant.config.vm.network_ip_ends_in_one"))
             end
           end
         end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 27d50e411..e9569ab76 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -869,8 +869,10 @@ en:
           on Windows, NFS isn't supported. If the problem persists, please
           contact Vagrant support.
         network_ip_ends_in_one: |-
-          Static IPs cannot end in ".1" since that address is always
-          reserved for the router. Please use another ending.
+          You assigned a static IP ending in ".1" to this machine.
+          This is very often used by the router and can cause the
+          network to not work properly. If you the network doesn't work
+          properly, try changing this IP.
         network_ip_required: |-
           An IP is required for a private network.
         network_fp_host_not_unique: |-