etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rags22489664/master' 

This closes #76
This commit is contained in:
Rohit Yadav 2015-02-18 11:22:24 +05:30
parent 1dc0611bcd d363b2afce
commit 446e08d25d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/scripts/system.js
View File

@ -534,6 +534,7 @@
}
}
},
disableInfiniteScrolling: true,
dataProvider: function (args) {
refreshNspData();
args.response.success({
@ -14185,7 +14186,7 @@
},
vSwitchGuestName: {
label: ' label.guest.traffic.vswitch.name',
label: 'label.guest.traffic.vswitch.name',
isHidden: true
},