Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineGuru.java		2012-07-27 13:47:46 -07:00
..
bindir	committing Chip Childers patches fixing licensing headers	2012-06-12 12:32:58 -04:00
conf	Remove cloud-daemonize and use JSVC	2012-07-24 19:32:39 +02:00
distro	agent: Remove cloud-cleanup.conf for Ubuntu	2012-07-27 09:01:15 +02:00
doc	Source code committed	2010-08-11 09:13:29 -07:00
scripts	committing Chip Childers patches fixing licensing headers	2012-06-12 12:32:58 -04:00
src/com/cloud/agent	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
test/com/cloud/agent	agent: Replace tabs by 4 spaces	2012-06-23 11:16:16 +02:00
.classpath	fixed eclipse classpath	2011-08-31 13:35:37 -07:00
.project	Bug 9479 - provide option for built in https	2011-09-01 16:01:28 -07:00