kylin git commit: fix merge error

2016-09-14 Thread shaofengshi
Repository: kylin Updated Branches: refs/heads/kylin-1.5.4-cdh5.7-release 63a5a0cf5 -> e805b5410 fix merge error Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e805b541 Tree: http://git-wip-us.apache.org/repos/asf/kylin/t

kylin git commit: fix merge error

2016-09-14 Thread shaofengshi
Repository: kylin Updated Branches: refs/heads/kylin-1.5.4-HBase1.x-release 7b8adacb1 -> f36405d83 fix merge error Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f36405d8 Tree: http://git-wip-us.apache.org/repos/asf/kylin