Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97f9ef52 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97f9ef52 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97f9ef52 Branch: refs/heads/master Commit: 97f9ef52a49b8ffd8fec50ab2cfa43e7cda7a36d Parents: 3580380 1e88ad4 Author: Rohit Yadav <[email protected]> Authored: Wed Nov 23 14:31:09 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Nov 23 14:31:09 2016 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py | 6 +++--- test/integration/component/test_vpn_users.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
