Merge release branch 4.7 to 4.8

* 4.7:
  CLOUDSTACK-9342: Site to Site VPN PFS not being set correctly


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01758ee8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01758ee8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01758ee8

Branch: refs/heads/4.9-bountycastle-daan
Commit: 01758ee867f75f2fc7487793a892e86952dc843d
Parents: 142f07d adaf410
Author: Will Stevens <[email protected]>
Authored: Mon Jul 18 14:06:08 2016 -0400
Committer: Will Stevens <[email protected]>
Committed: Mon Jul 18 14:06:08 2016 -0400

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to