You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/07/02 16:30:03 UTC
[1/2] git commit: updated refs/heads/4.3 to f6aff77
Repository: cloudstack
Updated Branches:
refs/heads/4.3 6d0650bbc -> f6aff77b8
CLOUDSTACK-6665: A fix for vpc routers not releasing dhcp leases.
Author: John Nielsen <jo...@betterservers.com>
Signed-off-by: Sebastien Goasguen <ru...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e50cb12
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e50cb12
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e50cb12
Branch: refs/heads/4.3
Commit: 0e50cb1246f762e9d1f0ece937395ffb193c6452
Parents: dae442e
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Tue May 20 11:02:14 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Wed Jul 2 16:28:02 2014 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/root/edithosts.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e50cb12/systemvm/patches/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh
index 57ee7dc..0ff6cc5 100755
--- a/systemvm/patches/debian/config/root/edithosts.sh
+++ b/systemvm/patches/debian/config/root/edithosts.sh
@@ -99,7 +99,7 @@ if [ $dnsmasq_managed_lease -eq 1 ]
then
#release previous dhcp lease if present
logger -t cloud "edithosts: releasing $ipv4"
- dhcp_release eth0 $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
+ dhcp_release $(ip route get "$ipv4/32" | grep " dev " | sed -e "s/^.* dev \([^ ]*\) .*$/\1/g") $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
logger -t cloud "edithosts: released $ipv4"
fi
[2/2] git commit: updated refs/heads/4.3 to f6aff77
Posted by se...@apache.org.
Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f6aff77b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f6aff77b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f6aff77b
Branch: refs/heads/4.3
Commit: f6aff77b8efdc722e9447983e478a078f07ec74a
Parents: 0e50cb1 6d0650b
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Wed Jul 2 16:29:15 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Wed Jul 2 16:29:15 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------