You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/09/24 02:01:00 UTC
git commit: updated refs/heads/master to 87dde70
Updated Branches:
refs/heads/master fb7f5a0a4 -> 87dde7024
Fixing the RAT exclusions after the refactor from 6c261042821c5597dab8d6be85dc59c948424e13
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87dde702
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87dde702
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87dde702
Branch: refs/heads/master
Commit: 87dde7024bddb6d27b5002f47b3549b097d9a14b
Parents: fb7f5a0
Author: Chip Childers <ch...@apache.org>
Authored: Mon Sep 23 20:00:39 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Mon Sep 23 20:00:39 2013 -0400
----------------------------------------------------------------------
pom.xml | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87dde702/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35eeedf..9fbd03f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -583,34 +583,34 @@
<exclude>ui/lib/reset.css</exclude>
<exclude>ui/lib/require.js</exclude>
<exclude>waf</exclude>
- <exclude>patches/systemvm/debian/systemvm.vmx</exclude>
- <exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/httpd.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/ports.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl</exclude>
- <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude>
- <exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude>
- <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>
- <exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
- <exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude>
- <exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
- <exclude>patches/systemvm/debian/config/etc/rc.local</exclude>
- <exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
- <exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
+ <exclude>systemvm/patches/debian/systemvm.vmx</exclude>
+ <exclude>systemvm/patches/debian/config/root/.ssh/authorized_keys</exclude>
+ <exclude>systemvm/patches/debian/config/etc/apache2/httpd.conf</exclude>
+ <exclude>systemvm/patches/debian/config/etc/apache2/ports.conf</exclude>
+ <exclude>systemvm/patches/debian/config/etc/apache2/sites-available/default</exclude>
+ <exclude>systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl</exclude>
+ <exclude>systemvm/patches/debian/config/etc/apache2/vhostexample.conf</exclude>
+ <exclude>systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl</exclude>
+ <exclude>systemvm/patches/debian/config/etc/vpcdnsmasq.conf</exclude>
+ <exclude>systemvm/patches/debian/config/etc/ssh/sshd_config</exclude>
+ <exclude>systemvm/patches/debian/config/etc/rsyslog.conf</exclude>
+ <exclude>systemvm/patches/debian/config/etc/logrotate.conf</exclude>
+ <exclude>systemvm/patches/debian/config/etc/logrotate.d/*</exclude>
+ <exclude>systemvm/patches/debian/config/etc/sysctl.conf</exclude>
+ <exclude>systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
+ <exclude>systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
+ <exclude>systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
+ <exclude>systemvm/patches/debian/vpn/etc/ipsec.conf</exclude>
+ <exclude>systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd</exclude>
+ <exclude>systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
+ <exclude>systemvm/patches/debian/vpn/etc/ipsec.secrets</exclude>
+ <exclude>systemvm/patches/debian/config/etc/haproxy/haproxy.cfg</exclude>
+ <exclude>systemvm/patches/debian/config/etc/cloud-nic.rules</exclude>
+ <exclude>systemvm/patches/debian/config/etc/modprobe.d/aesni_intel</exclude>
+ <exclude>systemvm/patches/debian/config/etc/rc.local</exclude>
+ <exclude>systemvm/patches/debian/config/var/www/html/userdata/.htaccess</exclude>
+ <exclude>systemvm/patches/debian/config/var/www/html/latest/.htaccess</exclude>
+ <exclude>systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
<exclude>tools/transifex/.tx/config</exclude>
<exclude>tools/marvin/marvin/sandbox/advanced/sandbox.cfg</exclude>
<exclude>tools/ngui/static/bootstrap/*</exclude>