nagakiran/contrail-web-controller — pull request #9 by manojgn (2014-08-12 12:03:44+00:00)
Title: On behalf of Vishnu:    1)Merged the update charts functionality in initscatterchart functio...

...n

2)Implemented the dynamic axis params,while initializing the charts we need the pass the parameters that required to display in and X and Y axis eg:

xAxisParams:[{lbl:'CPU (%)',key:'cpu',type:'float'},{lbl:'Instances',key:'instCnt'}]}};
Parameters are
"lbl" - value displayed in the drop down
"key" - key is used the look in the chart data
"type" - type of the value,if it is not present it will considered as the Integer

Conflicts:
webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
webroot/monitor/infra/dashboard/ui/js/monitor_infra_dashboard.js

Change-Id: Iccf580e83627429022a908c1bf8310613f718173