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/20 14:18:41 UTC

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

Merge release branch 4.7 to master

* 4.7:
  Refactor public ip retrieval into method
  CLOUDSTACK-9244 Fix setting up RFC1918 routes
  CLOUDSTACK-9239 throw exception on deprecated command
  Enhance VR performance by selectively executing tasks instead of brute-forcing
  CLOUDSTACK-9236: Load Balancing Health Check button displayed when non-NetScaler offering is used


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

Branch: refs/heads/master
Commit: 6f9215cf39773182095cf3dac3a1d3417ac409e0
Parents: 26936cd ed23ac6
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Jan 20 14:18:09 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Jan 20 14:18:09 2016 +0100

----------------------------------------------------------------------
 .../command/admin/account/LockAccountCmd.java   |  25 ++--
 .../debian/config/etc/init.d/cloud-early-config |  13 +-
 .../debian/config/opt/cloud/bin/configure.py    | 118 +++++++++++++------
 .../debian/config/opt/cloud/bin/cs/CsDhcp.py    |  29 +----
 .../config/opt/cloud/bin/update_config.py       |   2 +-
 ui/scripts/network.js                           |  52 +++++++-
 6 files changed, 157 insertions(+), 82 deletions(-)
----------------------------------------------------------------------