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

[re...@apache.org]

Merge pull request #1338 from nitin-maharana/CloudStack-Nitin21_4.7

CLOUDSTACK-9236: Load Balancing Health Check button displayed when non-NetScaler offering is usedLoad balancing health check option / button should only be displayed when a NetScaler based networking offering is being used.

If you try to use the health check option when NetScaler is not being used as the load balancing technology the UI throws an error stating that the health check option is not supported.

This button / option should be removed from the UI if NetScaler is not included in the network offering as customers will be confused.

Fix:
===
This button will be shown only when the load balancer is NetScaler.
Otherwise it is hidden.

* pr/1338:
  CLOUDSTACK-9236: Load Balancing Health Check button displayed when non-NetScaler offering is used

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/368bfc3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/368bfc3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/368bfc3e

Branch: refs/heads/master
Commit: 368bfc3e1b65c74dae0ebc37b3f02379b53b9ef4
Parents: c7ad1b6 3787f4d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Jan 19 21:36:31 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Jan 19 21:36:31 2016 +0100

----------------------------------------------------------------------
 ui/scripts/network.js | 52 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/368bfc3e/ui/scripts/network.js
----------------------------------------------------------------------