Chip Childers
|
806d033fe3
|
CLOUDSTACK-330: Correct Citrix information to be Apache in several .py files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
|
2012-10-12 12:18:56 -04:00 |
|
Alena Prokharchyk
|
353423acec
|
Merge branch 'master' into vpc
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
|
2012-07-06 12:04:10 -07:00 |
|
Sheng Yang
|
7349842c42
|
CS-15116: Add missing scripts for XCP server
Thank for the help from Wilhem Putz(wp@typoheads.at) to identify the issue.
|
2012-07-06 11:34:36 -07:00 |
|
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 |
|
David Nalley
|
d630fa8697
|
license header changes for scripts folder from Chip Childers
|
2012-06-23 00:58:00 -04:00 |
|
anthony
|
a4d0f91cfe
|
VPC : use routerProxy to call l2tpVpn
Conflicts:
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
|
2012-06-15 14:26:20 -07:00 |
|
anthony
|
c75fe80125
|
VPC : use routerProxy to call networkUsage.sh
Conflicts:
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
|
2012-06-15 14:25:21 -07:00 |
|
anthony
|
337c36d8b9
|
VPC: typo fix
Conflicts:
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
|
2012-06-15 14:23:41 -07:00 |
|
Abhi
|
6f0890ea3a
|
bug CS-12812: XCP has get_mtime missing from the utils, added it here
|
2012-04-20 10:43:01 +05:30 |
|
frank
|
2f634c0913
|
Switch to Apache license
|
2012-04-03 04:50:05 -07:00 |
|
anthony
|
3a4ee0d486
|
removed unused files
|
2012-02-27 13:59:09 -08:00 |
|
anthony
|
33b3e02c17
|
bug 10695: add XCP 1.0 support
status 10695: resolved fixed
|
2011-08-09 19:49:12 -07:00 |
|
Alex Huang
|
2dbb8eb502
|
bug 9651: Make same VLAN work on two different nics
|
2011-06-01 17:07:44 -07:00 |
|
anthony
|
7ec201bc69
|
bug 5405: version file is not needed
status 5405: resolved fixed
|
2011-01-28 20:06:54 -08:00 |
|
Manuel Amador (Rudd-O)
|
05c020e1f6
|
Source code committed
|
2010-08-11 09:13:29 -07:00 |
|