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:16 UTC

[2/2] git commit: updated refs/heads/4.9 to 6a449e4

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/4.9
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(-)
----------------------------------------------------------------------