X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/f972a63523827fbdb97461f909331b638f74d6d0..c24e307014de64ada268d8f179b7c6f7f70996cf:/svn.yml

diff --git a/svn.yml b/svn.yml
index 0b15131..038d27a 100644
--- a/svn.yml
+++ b/svn.yml
@@ -1,6 +1,10 @@
 %YAML 1.1
 ---
 packages:
+  hvirt-config: {}
+  hvirt-devconfig:
+    {punt: 2885, merge: hvirt-config}
+  hvirt-meta: {}
   invirt-autoinstaller: {}
   invirt-base: {}
   invirt-cluster-config: {}
@@ -17,19 +21,26 @@ packages:
   invirt-dns: {}
   invirt-host-master: {}
   invirt-images: {}
+  invirt-iptables: {}
+  invirt-kerberos-config: {}
   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-afs-apache:
+    {punt: 2920}
+  invirt-web-iptables:
+    {merge: invirt-web}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
+  python-afs: {}
   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:
@@ -37,7 +48,7 @@ packages:
   sipb-xen-base:
     {undouble: [314, 315], punt: 1350, merge: invirt-base}
   sipb-xen-chrony-config:
-    {punt: 1351}
+    {punt: 1282}
   sipb-xen-clvm-config:
     {punt: 1569}
   sipb-xen-console:
@@ -72,6 +83,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: {}
@@ -94,6 +106,7 @@ trunks:
     {punt: 303, inclusive: yes, merge: sipb-xen-www}
 scripts:
 - git-migration
+- git-hooks
 - install-invirt
 - invirt.mit.edu
 - osx-update
@@ -105,6 +118,11 @@ scripts:
 - pv-fixup
 - outage
 - lvm-backup-reader
+- update-contacts
+third:
+- common
+- openssh
+- openafs
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
@@ -135,3 +153,7 @@ quashes:
 - {rev: 1978, path: /trunk/packages/pyyaml/}
 - {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/}