Github user bzz commented on the pull request: https://github.com/apache/incubator-zeppelin/pull/860#issuecomment-222065338 @prasadwagle I think it's better to actually rebase (may be even interactive, to get rid of last 2 commits) the whole branch on top of the master instead of just merging it in. Could you please try that and see if it solves the first issue?
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---