anthony 951cba92bb Merge branch 'sg-in-advanced-zone' ...

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java

2013-02-07 15:19:41 -08:00

..

conf

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

scripts

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

src

Merge branch 'sg-in-advanced-zone'

2013-02-07 15:19:41 -08:00

test

IPv6: One network can have more than one vlan

2013-02-06 20:07:07 -08:00

pom.xml

Remove yet another test where the database was not properly mocked. FIXME

2013-02-02 12:18:51 +01:00