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 2016/01/11 16:23:11 UTC

[10/10] git commit: updated refs/heads/master to b1034ed

Merge release branch 4.7 to master

* 4.7:
  CLOUDSTACK-9220 Sort list of domains on Domain tab in UI
  Admin cannot see VMs on port forwarding page
  Fix mariadb related listCapacity bug (CLOUDSTACK-8966)
  CLOUDSTACK-9213 - Split the ACL rules using comma instead of dash.
  CLOUDSTACK-9213 - Formatting the code


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

Branch: refs/heads/master
Commit: b1034ed624b18f8c2778ee688258beb87ce125b4
Parents: 4014169 80703ca
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Jan 11 16:22:31 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Jan 11 16:22:31 2016 +0100

----------------------------------------------------------------------
 .../agent/api/routing/SetNetworkACLCommand.java | 31 ++++++++--------
 .../com/cloud/capacity/dao/CapacityDaoImpl.java | 37 ++++++++++----------
 ui/scripts/domains.js                           | 10 ++++++
 ui/scripts/network.js                           |  4 +++
 4 files changed, 49 insertions(+), 33 deletions(-)
----------------------------------------------------------------------