You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/27 10:20:40 UTC
[1/3] git commit: updated refs/heads/master to d048172
Repository: cloudstack
Updated Branches:
refs/heads/master 185be24ed -> d0481723e
systemvm: Fix regression from 825935
Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc72e4da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc72e4da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc72e4da
Branch: refs/heads/master
Commit: cc72e4da64e28ecf948246684233bbe8cfa46ab6
Parents: 50f80cc
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sun Nov 27 15:43:10 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Sun Nov 27 15:43:10 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc72e4da/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
index 3ede478..23b7499 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -137,15 +137,15 @@ class CsDhcp(CsDataBag):
if entry['default_entry'] == True:
self.cloud.add("%s,%s,%s,%sh" % (entry['mac_address'],
entry['ipv4_adress'],
- entry['host_name']),
- lease)
+ entry['host_name'],
+ lease))
else:
tag = entry['ipv4_adress'].replace(".","_")
self.cloud.add("%s,set:%s,%s,%s,%sh" % (entry['mac_address'],
tag,
entry['ipv4_adress'],
- entry['host_name']),
- lease)
+ entry['host_name'],
+ lease))
self.dhcp_opts.add("%s,%s" % (tag, 3))
self.dhcp_opts.add("%s,%s" % (tag, 6))
self.dhcp_opts.add("%s,%s" % (tag, 15))
[3/3] git commit: updated refs/heads/master to d048172
Posted by bh...@apache.org.
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/d0481723
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0481723
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0481723
Branch: refs/heads/master
Commit: d0481723e38b813898b921b9d55ad1ef2b07e797
Parents: 185be24 6a449e4
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sun Nov 27 15:50:18 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Sun Nov 27 15:50:18 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to d048172
Posted by bh...@apache.org.
Merge pull request #1788 from shapeblue/4.9-fix-merge-pr1766
systemvm: Fix regression from fwd-merging PR #1766Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766.
* pr/1788:
systemvm: Fix regression from 825935
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a449e4b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a449e4b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a449e4b
Branch: refs/heads/master
Commit: 6a449e4b3b3eb17df7171b8bdbb34516dbbeb151
Parents: 50f80cc cc72e4d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sun Nov 27 15:49:41 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Sun Nov 27 15:49:55 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------