diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
| commit | 48056fa49608bedc4c076181478485569fec7d5f (patch) | |
| tree | 3d60586d43ec504d7018af00ba7cf1d895e3f099 /.frlog | |
| parent | 4decf5460114e222532147ccc97fbec05bc5cccb (diff) | |
| parent | 5bbd235a4a30b26f477b73b2779619a5f20ad73b (diff) | |
| download | conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.tar.gz conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.zip | |
Merge branch 'pacifica' into oxnard
Conflicts:
.frlog
debian/changelog
Diffstat (limited to '.frlog')
| -rw-r--r-- | .frlog | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,10 @@ Tue Dec 28 20:41:49 UTC 2010: [new branch] at [debian/0.9.14-2+vyatta11] Thu Jul 7 20:52:06 PDT 2011: [new branch] at [debian/0.9.14-2+vyatta12] Tue Jan 31 11:15:48 PST 2012: [reset epoch] at [debian/1.0.1-2+vyatta18] -Sat Mar 3 02:21:36 PST 2012: [new branch] at [debian/1.0.1-2+vyatta20] +Sat Mar 3 02:24:16 PST 2012: [new branch] at [debian/1.0.1-2+vyatta20] +Mon Apr 9 17:05:18 PDT 2012: [force release:i386 vm build environ fixed] at [debian/1.0.1-2+vyatta21] +Wed May 30 09:47:45 PDT 2012: [force release:post build dependency fix on build machine] at [debian/1.0.1-2+vyatta23] +Wed May 30 10:55:48 PDT 2012: [force release:dependency fix on build machine] at [debian/1.0.1-2+vyatta24] +Wed May 30 13:03:48 PDT 2012: [forced release] at [debian/1.0.1-2+vyatta25] +Wed May 30 14:48:07 PDT 2012: [forced release] at [debian/1.0.1-2+vyatta26] +Mon Jun 4 21:31:23 PDT 2012: [forced release:cttimeout refreshed on build machine] at [debian/1.0.1-2+vyatta29] |