X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/7fc535054ab65171aceb46b02e83f2c9da6526d1..8d92c1e724d1bec078082145ede67b20300a25bf:/svn.yml

diff --git a/svn.yml b/svn.yml
index 5e2b0e4..691750a 100644
--- a/svn.yml
+++ b/svn.yml
@@ -1,6 +1,7 @@
 %YAML 1.1
 ---
 packages:
+  hvirt-devconfig: {}
   invirt-autoinstaller: {}
   invirt-base: {}
   invirt-cluster-config: {}
@@ -17,19 +18,23 @@ packages:
   invirt-dns: {}
   invirt-host-master: {}
   invirt-images: {}
+  invirt-iptables: {}
   invirt-manual-config: {}
   invirt-remote: {}
   invirt-remote-host:
     {punt: 1822, merge: invirt-remote, branch: invirt-remote-host}
   invirt-remote-server:
     {punt: 1822, merge: invirt-remote, branch: invirt-remote-server}
+  invirt-ssh-config: {}
   invirt-svn-server: {}
   invirt-vnc-client: {}
   invirt-vnc-server: {}
   invirt-web: {}
-  invirt-web-iptables: {}
+  invirt-web-iptables:
+    {merge: invirt-web}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
+  python-afs: {}
   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:
@@ -72,6 +77,7 @@ packages:
     {punt: 1387, merge: invirt-vnc-server}
   sipb-xen-www:
     {punt: 1360, merge: invirt-web}
+  xvm-authz-locker: {}
   xvm-console-devconfig:
     {punt: 700}
   xvm-db-backup: {}
@@ -106,6 +112,7 @@ scripts:
 - pv-fixup
 - outage
 - lvm-backup-reader
+- update-contacts
 third:
 - common
 - openssh
@@ -141,3 +148,6 @@ quashes:
 - {rev: 2033, path: /trunk/scripts/}
 - {rev: 2035, path: /trunk/scripts/}
 - {rev: 2309, path: /third_tags/openssh/debathena1/}
+- {rev: 2614, path: /package_branches/invirt-base/}
+- {rev: 2615, path: /package_branches/invirt-base/}
+- {rev: 2616, path: /package_branches/invirt-base/}