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/05/08 04:49:16 UTC
[cloudstack] branch master updated (45f62c3 -> 3f7fca0)
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 45f62c3 Merge pull request #1813 from priyankparihar/CLOUDSTACK-9604
adds d693640 Allow CGN (RFC6598) to be used within a VPC
adds 14d08a9 Expanded tests of RFC1918 and RFC6598 validation code.
adds 2a48f65 cleanup trailing space for checkstyle
adds 7228216 Merge pull request #1606 from myENA/upstream/vpc-cgn
new 3f7fca0 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:
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 23 ++++++++++++----------
.../java/com/cloud/utils/net/NetUtilsTest.java | 10 ++++++++--
3 files changed, 22 insertions(+), 13 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
Posted by 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 3f7fca02d4cd2687c7209f2176a8584e8ef4d7e6
Merge: 45f62c3 7228216
Author: Rajani Karuturi <ra...@accelerite.com>
AuthorDate: Mon May 8 10:18:12 2017 +0530
Merge release branch 4.9 to master
* 4.9:
cleanup trailing space for checkstyle
Expanded tests of RFC1918 and RFC6598 validation code.
Allow CGN (RFC6598) to be used within a VPC
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 23 ++++++++++++----------
.../java/com/cloud/utils/net/NetUtilsTest.java | 10 ++++++++--
3 files changed, 22 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.