Alena Prokharchyk 372568cb9a CS-15743: disable static nat as a part of network resources cleanup ...

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java

2012-07-30 11:08:33 -07:00

..

conf

fixing line endings in server

2012-04-07 20:13:10 -04:00

scripts

…

src/com/cloud

CS-15743: disable static nat as a part of network resources cleanup

2012-07-30 11:08:33 -07:00

test

Fixed unittest build failure

2012-07-30 15:15:47 +05:30

.classpath

bug 6745: Using UUID instead of integers - for System VM s

2011-11-03 07:33:57 -07:00

.project

…