X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/7ee61b3ca53e31cfd15f533b94f19de94f096cee..5d3f26f31a6f320a79a3792493b16470c31b7a22:/svn.yml diff --git a/svn.yml b/svn.yml index 8c1def7..e43bfd9 100644 --- a/svn.yml +++ b/svn.yml @@ -82,6 +82,17 @@ 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 - invirt.mit.edu