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
|
1a6102be1e
|
moving LDAP authenticator to plugins/user-authenticators/ldap
|
2012-06-25 19:30:00 -07:00 |
|
Murali reddy
|
974ad65b01
|
moving out random host allocator to plugins/host-allocators/random/
|
2012-06-25 18:47:47 -07:00 |
|
Murali reddy
|
621f2447bb
|
Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod
|
2012-06-25 17:58:45 -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 |
Alex Huang
|
6e48383ef8
|
moved out user dispsersing deployment planner
|
2012-06-20 16:08:51 -07:00 |
frank
|
a2d49bef69
|
Change OVM script deploy target in line with Alex re-packaging change
fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore
|
2012-06-20 10:45:56 -07:00 |
|
Alex Huang
|
e2a32ab4f7
|
Introduced plugins directory.
Moved ovm into plugins.
Introduced build.xml for ovm.
|
2012-06-19 18:27:09 -07:00 |