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 |
|
Murali reddy
|
c41094154d
|
moving out OVS code to plugins/network-elements/ovs
|
2012-06-28 17:23:41 -07:00 |
|
Murali reddy
|
392ae5cb13
|
moving out Srx code into Plugins/network-elements
|
2012-06-25 16:55:53 -07:00 |
|
Murali reddy
|
422c4ce513
|
moving out F5 code from server into plugins/network-elements/f5/
|
2012-06-23 14:16:59 -07:00 |
|
Murali reddy
|
49b88472a5
|
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
|
2012-06-21 18:57:18 -07:00 |
|