Ubuntu
ipvsadm package

Merge lp:~clint-fewbar/ubuntu/lucid/ipvsadm/fix-activeconns-report into lp:ubuntu/lucid/ipvsadm

  1. Lucid (10.04)
  2. fix-activeconns-report
  3. Merge into lucid
Proposed by Clint Byrum
Status: Merged
Merge reported by: Dustin Kirkland 
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/lucid/ipvsadm/fix-activeconns-report
Merge into: lp:ubuntu/lucid/ipvsadm
Diff against target: 41 lines (+10/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
libipvs/libipvs.c (+1/-1)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/lucid/ipvsadm/fix-activeconns-report
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Ubuntu Development Team Pending
Review via email: mp+41252@code.launchpad.net

Description of the change

SRU to lucid, identical to natty version.

Not sure about the patch revision.. since natty and lucid had the same version. Should it just be the exact same version as the one from natty rather than $VER.1 as I've done in the MP? Seems like that would be the case.

Please advise on that, otherwise it has been built and smoke tested on a lucid schroot. I did not repeat the entire test case as I do not have a lucid server to test on.

To post a comment you must log in.
lp:~clint-fewbar/ubuntu/lucid/ipvsadm/fix-activeconns-report updated
8. By Clint Byrum

fixing version to be lower than natty

Revision history for this message
Dustin Kirkland  (kirkland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-10 07:35:04 +0000
3+++ debian/changelog 2010-11-22 23:17:33 +0000
4@@ -1,3 +1,10 @@
5+ipvsadm (1:1.25.clean-1ubuntu0.1) lucid-proposed; urgency=low
6+
7+ * libipvs/libipvs.c: upstream patch (r64) to fix incorrect activeconns,
8+ (Debian bug 574587), (LP: #663564)
9+
10+ -- Clint Byrum <clint@ubuntu.com> Mon, 22 Nov 2010 15:13:04 -0800
11+
12 ipvsadm (1:1.25.clean-1) unstable; urgency=low
13
14 * New upstream version (Closes: #540423)
15
16=== modified file 'debian/control'
17--- debian/control 2009-11-10 07:35:04 +0000
18+++ debian/control 2010-11-22 23:17:33 +0000
19@@ -1,7 +1,8 @@
20 Source: ipvsadm
21 Section: net
22 Priority: extra
23-Maintainer: Alexander Wirt <formorer@debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Alexander Wirt <formorer@debian.org>
26 Standards-Version: 3.8.3
27 Build-Depends: debhelper (>= 5), libpopt-dev, po-debconf, libnl-dev
28
29
30=== modified file 'libipvs/libipvs.c'
31--- libipvs/libipvs.c 2009-11-10 07:35:04 +0000
32+++ libipvs/libipvs.c 2010-11-22 23:17:33 +0000
33@@ -747,7 +747,7 @@
34 d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]);
35 d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]);
36 d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]);
37- d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
38+ d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
39 d->entrytable[i].af = d->af;
40
41 if (ipvs_parse_stats(&(d->entrytable[i].stats),

Subscribers

People subscribed via source and target branches

to all changes: