You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/08/12 08:15:13 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 6b6cc71be9ac77166e899b27328ae40e5f0f2ac0
Merge: ce7a32c 86939e7
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Aug 12 13:44:41 2020 +0530

    Merge remote-tracking branch 'origin/4.13' into 4.14

 .../api/command/user/vpc/CreateStaticRouteCmd.java     |  2 +-
 .../api/command/user/vpc/ListStaticRoutesCmd.java      |  7 +++++++
 .../java/com/cloud/network/vpc/dao/StaticRouteDao.java |  2 ++
 .../com/cloud/network/vpc/dao/StaticRouteDaoImpl.java  |  9 +++++++++
 .../java/com/cloud/network/vpc/VpcManagerImpl.java     | 18 +++++++++++++++++-
 ui/scripts/vpc.js                                      |  3 ++-
 6 files changed, 38 insertions(+), 3 deletions(-)