Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java		2012-07-31 13:37:28 -07:00
..
apache2	VCP : for each network, there will be a seperate config file deriving from this one	2012-07-27 15:04:42 -07:00
cron.daily	bug 7141: cleanup cloudstack logs older than 7 days	2011-01-13 12:36:38 -08:00
default	remove patches/systemv, and mv tools/systemvm into patches	2010-10-05 20:41:39 -07:00
haproxy	remove patches/systemv, and mv tools/systemvm into patches	2010-10-05 20:41:39 -07:00
httpd/conf	remove patches/systemv, and mv tools/systemvm into patches	2010-10-05 20:41:39 -07:00
init.d	VPC : add nic hot plug script	2012-06-15 14:32:10 -07:00
iptables	VPC : this is default iptables for vpc route	2012-07-27 15:04:42 -07:00
logrotate.d	bug 7141: rotate standard logs more aggressively	2011-01-13 12:36:38 -08:00
modprobe.d	bug 13160: blacklist aesni_intel module to avoid crash	2012-01-27 16:27:19 -08:00
profile.d	Switch to Apache license	2012-04-03 04:50:05 -07:00
ssh	remove patches/systemv, and mv tools/systemvm into patches	2010-10-05 20:41:39 -07:00
cloud-nic.rules	VPC : add nic hot plug script	2012-06-15 14:32:10 -07:00
dnsmasq.conf	VPC : revert dnsmasq.conf	2012-06-15 14:33:22 -07:00
logrotate.conf	bug 7141: rotate logs	2011-01-12 17:31:39 -08:00
rc.local	remove patches/systemv, and mv tools/systemvm into patches	2010-10-05 20:41:39 -07:00
rsyslog.conf	bug 7141: rotate logs	2011-01-12 17:31:39 -08:00
sysctl.conf	Disable IPv6 in the systemvm	2012-07-30 15:17:56 +02:00
vpcdnsmasq.conf	VPC : add new dnsmasq.conf for VPC domr	2012-06-15 14:30:39 -07:00