Min Chen 613a061977 Merge branch 'master' into vim51_win8 ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java		2013-03-04 17:32:52 -08:00
..
conf	From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001	2013-02-25 14:57:57 -08:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Merge branch 'master' into vim51_win8	2013-03-04 17:32:52 -08:00
test	Merge branch 'master' into vim51_win8	2013-03-04 17:32:52 -08:00
pom.xml	ignore the tests looking for db	2013-03-01 12:04:06 +05:30