You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/06/20 04:47:02 UTC

[cloudstack] 01/01: Merge release branch 4.9 to master

This is an automated email from the ASF dual-hosted git repository.

rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit b9a4cb8770cbdadfdb620ca4c82859b2c0d9b08c
Merge: a25b54c dab9795
Author: Rajani Karuturi <ra...@accelerite.com>
AuthorDate: Tue Jun 20 10:14:50 2017 +0530

    Merge release branch 4.9 to master
    
    * 4.9:
      vRouter defer configure: Resolve merge conflicts
      vRouter: vr_cfg: style consistency fixes
      vRouter: vr_cfg: Keep the original cfg
      vRouter: prevent fh leakage and use buffered writes in DataBags

 .../debian/config/opt/cloud/bin/cs/CsConfig.py     |  2 +-
 .../patches/debian/config/opt/cloud/bin/merge.py   | 27 +++++------
 .../debian/config/opt/cloud/bin/update_config.py   |  9 ++--
 .../patches/debian/config/opt/cloud/bin/vr_cfg.sh  | 54 +++++++++-------------
 4 files changed, 42 insertions(+), 50 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.