Merge remote-tracking branch 'rags22489664/master' This closes #76
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/446e08d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/446e08d2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/446e08d2 Branch: refs/heads/hotfix/scp-exception Commit: 446e08d25d3b3f2aa6320fda7b52e824faa27461 Parents: 1dc0611 d363b2a Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Wed Feb 18 11:22:24 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Wed Feb 18 11:22:24 2015 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------