git-migration updates for openais, corosync, xvm-host-setup-notes.

[invirt/scripts/git-migration.git] / svn.yml

diff --git a/svn.yml b/svn.yml
index e276b15..db9d361 100644 (file)
--- a/svn.yml
+++ b/svn.yml
@@ -1,7 +1,10 @@
 %YAML 1.1
 ---
 packages:
-  hvirt-devconfig: {}
+  hvirt-config: {}
+  hvirt-devconfig:
+    {punt: 2885, merge: hvirt-config}
+  hvirt-meta: {}
   invirt-autoinstaller: {}
   invirt-base: {}
   invirt-cluster-config: {}
@@ -18,17 +21,23 @@ 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: {}
@@ -39,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:
@@ -114,6 +123,8 @@ 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/}