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

diff --git a/svn.yml b/svn.yml
index 0a1f6a2..b8a91e9 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,24 @@ 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-iptables:
+    {merge: invirt-web}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
+  python-afs: {}
   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:
@@ -72,6 +78,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 +101,7 @@ trunks:
     {punt: 303, inclusive: yes, merge: sipb-xen-www}
 scripts:
 - git-migration
+- git-hooks
 - install-invirt
 - invirt.mit.edu
 - osx-update
@@ -105,9 +113,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/}
@@ -139,3 +149,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/}