[08/13] kylin git commit: KYLIN-3165 fix cannot auto merge bug

2018-01-21 Thread lidong
KYLIN-3165 fix cannot auto merge bug Signed-off-by: shaofengshi Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c3d17452 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c3d17452 Diff: http://git-wip-us.apache.org/rep

kylin git commit: KYLIN-3165 fix cannot auto merge bug

2018-01-17 Thread shaofengshi
Repository: kylin Updated Branches: refs/heads/master a6189a606 -> c3d17452a KYLIN-3165 fix cannot auto merge bug Signed-off-by: shaofengshi Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c3d17452 Tree: http://git-wip-u