Alena Prokharchyk 7df7abf327 Added missing @Inject to the ipAddressManager ... Conflicts: server/src/com/cloud/user/AccountManagerImpl.java		2013-11-21 14:29:39 -08:00
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type	2013-11-14 15:31:33 -08:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Added missing @Inject to the ipAddressManager	2013-11-21 14:29:39 -08:00
test	Broke up some long strings	2013-11-21 07:25:01 -08:00
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00