This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 6a1ddf7 Merge remote-tracking branch 'origin/4.14'
add 86939e7 server: Fixed private gateway can't be deleted (#4016)
add 6b6cc71 Merge remote-tracking branch 'origin/4.13' into 4.14
add 7bbb4d4 Merge remote-tracking branch 'origin/4.14'
No new revisions were added by this update.
Summary of changes:
.../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(-)