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

diff --git a/svn.yml b/svn.yml
index 8c1def7..db9d361 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: {}
@@ -10,35 +14,41 @@ 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: {}
   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: {}
-  libyaml: {}
+  python-afs: {}
   python-pydhcplib: {}
   python-routefs: {}
-  pyyaml: {}
   sipb-xen-autoinstaller:
     {punt: 1569, merge: invirt-autoinstaller}
   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:
@@ -73,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: {}
@@ -82,14 +93,42 @@ packages:
   xvm-meta: {}
   xvm-munin-config: {}
   xvm-prodconfig: {}
+trunks:
+  dhcp:
+    {punt: 282, merge: sipb-xen-dhcp}
+  dns:
+    {punt: 269, merge: sipb-xen-dns, branch: dns}
+  vnc/vnc_javasrc:
+    {punt: 305, merge: sipb-xen-vnc-client}
+  vnc/vnc_server:
+    {punt: 286, inclusive: yes, merge: sipb-xen-vnc-server}
+  web:
+    {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
+- openais
+- corosync
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
+- {rev: 318, path: /package_tags/sipb-xen-dev/13/sipb-xen-dev/}
 - {rev: 347, path: /package_tags/sipb-xen-console/2/}
 - {rev: 348, path: /package_tags/sipb-xen-console/2/sipb-xen-console/}
 - {rev: 349, path: /package_tags/sipb-xen-console/2/}
@@ -98,9 +137,25 @@ quashes:
 - {rev: 462, path: /package_tags/sipb-xen-dev/14/sipb-xen-dev/}
 - {rev: 463, path: /package_tags/sipb-xen-dev/14/}
 - {rev: 742, path: /trunk/packages/sipb-xen-autoinstaller/}
+- {rev: 898, path: /trunk/packages/libyaml/}
+- {rev: 898, path: /trunk/packages/pyyaml/}
+- {rev: 899, path: /package_tags/libyaml/}
+- {rev: 900, path: /package_tags/libyaml/0.1.1-1~andersk1/}
+- {rev: 901, path: /package_tags/pyyaml/}
+- {rev: 902, path: /package_tags/pyyaml/3.05-2~andersk1/}
+- {rev: 958, path: /trunk/packages/pyyaml/}
+- {rev: 964, path: /package_tags/pyyaml/3.05-2~invirt1/}
 - {rev: 1201, path: /trunk/packages/invirt-console-server/}
 - {rev: 1455, path: /trunk/packages/xvm-prodconfig/}
 - {rev: 1757, path: /trunk/packages/invirt-xen-config/}
 - {rev: 1819, path: /trunk/packages/invirt-console/}
 - {rev: 1864, path: /trunk/scripts/prod-migration/}
 - {rev: 1904, path: /trunk/packages/invirt-dhcp/}
+- {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/}