[5/7] git commit: updated refs/heads/master to 11dd9fb

[bh...@apache.org]

Merge pull request #1821 from murali-reddy/traffic_type_in_lower_case

CLOUDSTACK-9659: mismatch in traffic type in ip_associations.json and ips.jsonAs part of the bug 'CLOUDSTACK-9339 Virtual Routers don't handle Multiple Public Interfaces correctly'
issue of mismatch of traffic type represented by 'nw_type' in config sent by management server in
ip_associations.json and how it is persisted in the ips.json data bag are differnet,
is addressed, however missed the change in final merge.
this bug is to add the functionality in cs_ip.py, to lower the traffic type sent by management server before persisting in the ips.json databag

* pr/1821:
  CLOUDSTACK-9659: mismatch in traffic type in ip_associations.json and ips.json

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


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

Branch: refs/heads/master
Commit: 29fa2e0b8b90754e4258c596273a25c483be3a40
Parents: f70428a 8b4c36e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 8 17:15:47 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 8 17:15:47 2016 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------