X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/63a649ab3f7144f3ceb10871b2d280e3324edeb2..72eb00d9bc6d56ad468a269ff1e2fb45ef063022:/svn.yml

diff --git a/svn.yml b/svn.yml
index cd0fbfa..e276b15 100644
--- a/svn.yml
+++ b/svn.yml
@@ -1,6 +1,7 @@
 %YAML 1.1
 ---
 packages:
+  hvirt-devconfig: {}
   invirt-autoinstaller: {}
   invirt-base: {}
   invirt-cluster-config: {}
@@ -10,7 +11,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 +31,7 @@ packages:
   invirt-web-iptables: {}
   invirt-xen-config: {}
   libapache2-mod-auth-sslcert: {}
+  python-afs: {}
   python-pydhcplib: {}
   python-routefs: {}
   sipb-xen-autoinstaller:
@@ -71,6 +74,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,6 +97,7 @@ trunks:
     {punt: 303, inclusive: yes, merge: sipb-xen-www}
 scripts:
 - git-migration
+- git-hooks
 - install-invirt
 - invirt.mit.edu
 - osx-update
@@ -100,6 +105,15 @@ scripts:
 - 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/}
@@ -130,3 +144,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/}