mirror of https://github.com/apache/cloudstack.git
Conflicts: api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java server/src/com/cloud/server/ManagementServerImpl.java |
||
|---|---|---|
| .. | ||
| com/cloud | ||
| org/apache/cloudstack | ||