3 Commits

Author	SHA1	Message	Date
Alena Prokharchyk	634cd78baa	Merge branch 'master' into vpc ... Conflicts: api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/api/ResponseGenerator.java api/src/com/cloud/api/commands/ListNetworksCmd.java api/src/com/cloud/api/response/NetworkResponse.java api/src/com/cloud/event/EventTypes.java api/src/com/cloud/network/NetworkService.java client/tomcatconf/commands.properties.in scripts/network/domr/getDomRVersion.sh scripts/network/domr/ipassoc.sh scripts/network/domr/l2tp_vpn.sh scripts/network/domr/networkUsage.sh scripts/network/domr/router_proxy.sh server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/dao/IPAddressDao.java server/src/com/cloud/network/dao/IPAddressDaoImpl.java setup/apidoc/gen_toc.py setup/db/create-schema.sql wscript	2012-06-28 17:41:40 -07:00
anthony	a08c9e7890	VPC : move acl.sh ipassoc.sh to /opt/cloud/bin/	2012-06-15 14:24:09 -07:00
anthony	8c1700a3a4	VPC : introduce router_proxy.sh, resource should use this as a proxy to call scripts inside domr ... already did this for ipassoc and getDomRVersion	2012-06-15 14:22:49 -07:00