etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/ui
History
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
..
css Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
images Fix sprite sheet, which was out of date 2012-07-24 15:35:18 -07:00
lib (1) CS-15057: Remove jquery.timer.js from source code. Replace it with native JavaScript functions. 2012-06-21 12:13:41 -07:00
scripts Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
tests applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
.classpath cloudStack 3.0 new UI - move project file and classpath from old UI directory to new UI directory. 2011-11-04 11:32:10 -07:00
.project cloudStack 3.0 new UI - move project file and classpath from old UI directory to new UI directory. 2011-11-04 11:32:10 -07:00
index.jsp Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00