[cloudstack] branch master updated (6d00fc1 -> ed2f573)

[ra...@apache.org]

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

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

      from  6d00fc1   Merge pull request #2062 from swill/fix_vpn_reset
      adds  607ce94   Honor network.dns.basiczone.updates setting when sending DHCP config to VRs
      adds  550bec8   Merge pull request #2077 from wido/4.9-dhcpupdatesvr
       new  ed2f573   Merge release branch 4.9 to master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../com/cloud/network/router/CommandSetupHelper.java  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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

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

[ra...@apache.org]

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 ed2f5731609e7e4bf791560f2170cb5ad44a47d2
Merge: 6d00fc1 550bec8
Author: Rajani Karuturi <ra...@accelerite.com>
AuthorDate: Tue May 9 09:30:56 2017 +0530

    Merge release branch 4.9 to master
    
    * 4.9:
      Honor network.dns.basiczone.updates setting when sending DHCP config to VRs

 .../com/cloud/network/router/CommandSetupHelper.java  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)


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