You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/11 17:15:47 UTC

[2/2] git commit: updated refs/heads/master to 1ed5c20

Merge pull request #1197 from ustcweizhou/vpc-router-by-keyword

[4.7] CLOUDSTACK-9129: list vpc routers by keyword in Infrastructure -> Virtual Routers
and two more changes:
(1) add network name/vpc name in the listRouters response
(2) add network name/vpc id, vpc name in the router details page

* pr/1197:
  CLOUDSTACK-9129: list vpc routers by keyword in Infrastructure -> Virtual Routers

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ed5c209
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ed5c209
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ed5c209

Branch: refs/heads/master
Commit: 1ed5c209086aa38da1f75881056cf2d6d6c1afc9
Parents: 312b9af 24f1396
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Dec 11 17:14:42 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Dec 11 17:14:43 2015 +0100

----------------------------------------------------------------------
 .../api/response/DomainRouterResponse.java      |  16 +++
 .../com/cloud/api/query/QueryManagerImpl.java   |   1 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |   3 +
 .../cloud/api/query/vo/DomainRouterJoinVO.java  |   7 ++
 setup/db/db/schema-461to470.sql                 | 107 +++++++++++++++++++
 ui/scripts/system.js                            |  71 ++++++++++++
 6 files changed, 205 insertions(+)
----------------------------------------------------------------------