etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
Chip Childers 082d5634d1 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Conflicts:
	server/src/com/cloud/netapp/NetappAllocator.java
	server/src/com/cloud/netapp/dao/LunDao.java
	server/src/com/cloud/netapp/dao/PoolDao.java
	server/src/com/cloud/netapp/dao/VolumeDao.java
	server/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java
	server/src/com/cloud/servlet/ConsoleProxyClientParam.java
	server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java
	server/src/com/cloud/servlet/ConsoleProxyServlet.java
	server/src/com/cloud/storage/dao/VolumeHostDao.java
	server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
 		2012-07-09 11:48:34 -04:00
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts
…
src/com/cloud Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-09 11:48:34 -04:00
test Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 2012-07-06 11:43:31 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project
…