diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:30:06 +0100 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:30:06 +0100 |
commit | 37db2e326b290c9c756eecfe08c464e8b627a682 (patch) | |
tree | caf104e0fda4f23f829b2945a316c7da2a6554f7 /debian | |
parent | 13a053c14c402fa0f7be174adbe9cfa53e811369 (diff) | |
parent | 6daba1eb14430aa02f8f56614188a598b383c8ef (diff) | |
download | vyatta-cfg-system-37db2e326b290c9c756eecfe08c464e8b627a682.tar.gz vyatta-cfg-system-37db2e326b290c9c756eecfe08c464e8b627a682.zip |
Merge branch 'current' into crux
Conflicts:
Makefile.am
debian/changelog
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index cac0a8d9..bd4efe61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -vyatta-cfg-system (1.2.0-1) stable; urgency=medium +vyatta-cfg-system (0.20.44+vyos2+current15) unstable; urgency=medium - * New branch. + * Virtio network card, no info (maybe not fully supported?) - -- Daniil Baturin <daniil@baturin.org> Fri, 28 Sep 2018 21:45:32 +0200 + -- hagbard <vyosdev@derith.de> Mon, 15 Oct 2018 14:27:24 -0700 vyatta-cfg-system (0.20.44+vyos2+current14) unstable; urgency=medium |