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/10/26 06:12:20 UTC
[2/2] git commit: updated refs/heads/master to 0fd3919
Merge pull request #964 from snuf/Ovm3NetLabelFix
FIX: Ovm3 physical network traffic labels to work.The labeling was broken. Only labels assigned at zone creation
were used, changing labels was not working. Tested with changing
a label and checking it, labels at zone creation still works.
As a bonus fixed the consistency of KVM in Dutch compared to other
traffic labels in Dutch and copied in the OVM3 translated label
in other languages based on the other tarffic labels in those languages.
* pr/964:
FIX: Ovm3 physical network traffic labels to work.
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/0fd3919e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fd3919e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fd3919e
Branch: refs/heads/master
Commit: 0fd3919e8a127c3afaf9284ca1e442053f8d12fd
Parents: 7d73e9b 1022883
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Oct 26 06:08:42 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Oct 26 06:08:43 2015 +0100
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 1 +
client/WEB-INF/classes/resources/messages_fr_FR.properties | 1 +
client/WEB-INF/classes/resources/messages_it_IT.properties | 2 ++
client/WEB-INF/classes/resources/messages_ja_JP.properties | 1 +
client/WEB-INF/classes/resources/messages_ko_KR.properties | 2 ++
client/WEB-INF/classes/resources/messages_nb_NO.properties | 1 +
client/WEB-INF/classes/resources/messages_nl_NL.properties | 3 ++-
client/WEB-INF/classes/resources/messages_pt_BR.properties | 1 +
client/WEB-INF/classes/resources/messages_ru_RU.properties | 2 ++
client/WEB-INF/classes/resources/messages_zh_CN.properties | 1 +
.../cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java | 4 ++--
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
server/src/com/cloud/network/NetworkServiceImpl.java | 8 +++++++-
ui/dictionary.jsp | 1 +
14 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------