X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/46528f7f854502943257a7d104b19e1b102e3e60..7b82d89c311e90398bb1d7302e7bb09d9c74e44c:/svn.yml

diff --git a/svn.yml b/svn.yml
index 7d87429..2bacda0 100644
--- a/svn.yml
+++ b/svn.yml
@@ -10,7 +10,8 @@ packages:
   invirt-console-server:
     {punt: 1813, merge: invirt-console}
   invirt-database: {}
-  invirt-database-server: {}
+  invirt-database-server:
+    {punt: 2218, merge: invirt-database, branch: invirt-database-server}
   invirt-dev: {}
   invirt-dhcp: {}
   invirt-dns: {}
@@ -29,6 +30,7 @@ packages:
   invirt-web-iptables: {}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
+  python-afs: {}
   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:
@@ -71,6 +73,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: {}
@@ -93,11 +96,23 @@ trunks:
     {punt: 303, inclusive: yes, merge: sipb-xen-www}
 scripts:
 - git-migration
+- git-hooks
 - install-invirt
 - invirt.mit.edu
+- osx-update
 - munin
 - prod-migration
 - vnc-client
+- invirt-admin
+- invirt-test-build
+- 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/}
@@ -127,3 +142,8 @@ quashes:
 - {rev: 1968, path: /trunk/packages/libyaml/}
 - {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/}