ambari-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jayush Luniya (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (AMBARI-7718) Rebase branch-windows-dev against trunk
Date Thu, 09 Oct 2014 22:15:34 GMT

    [ https://issues.apache.org/jira/browse/AMBARI-7718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14165859#comment-14165859
] 

Jayush Luniya commented on AMBARI-7718:
---------------------------------------

1: git rebase origin/trunk 
Last commit in trunk:
commit e41a19201e359b14127f8e35f3179e9163fec109
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Date:   Thu Oct 9 20:07:01 2014 +0300

    AMBARI-7712. Authorization Exceptions in hive server logs (aonishuk)

2: Notice: The rebase fail with 
Failed to merge in the changes.
Patch failed at 0001 AMBARI-7621. Import initial contribution for Ambari support
 on Windows to branch-windows-dev. (Jayush Luniya and Florian Barca via yusaku)
The copy of the patch that failed is found in:
   c:/win_apache/ambari/.git/rebase-apply/patch

3: Undo all changes
git reset HEAD
git checkout .
git clean -f -d

4: Verify there are no changes 
C:\win_apache\ambari>git status
rebase in progress; onto e41a192
You are currently rebasing branch 'branch-widows-dev' on 'e41a192'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working directory clean

5: Apply the patch 
git apply AMBARI-7718.patch

6: Stage all changes
git add -A .

7: Continue rebase
git rebase --continue

8: Verify the changes compile
mvn clean package -Dskiptests -Dfindbugs.skip=true

9: Install ambari server and ambari agent MSI and verify that server and agent start up.

10: Known Issues:
- Additional stabilization changes are required for end to end HDP deployment through Ambari
Web portal. There have been a bunch of changes in trunk that need to be addressed on Windows
- Unit tests are have been updated yet for Windows.

> Rebase branch-windows-dev against trunk
> ---------------------------------------
>
>                 Key: AMBARI-7718
>                 URL: https://issues.apache.org/jira/browse/AMBARI-7718
>             Project: Ambari
>          Issue Type: Bug
>          Components: ambari-agent, ambari-server, ambari-web
>    Affects Versions: 2.0.0
>            Reporter: Jayush Luniya
>            Assignee: Jayush Luniya
>             Fix For: 2.0.0
>
>         Attachments: AMBARI-7718.patch
>
>   Original Estimate: 48h
>  Remaining Estimate: 48h
>
> At present branch-windows-dev is not rebased to latest from trunk and is simply a snapshot
of initial Windows support contribution. This JIRA is to rebase the branch-windows-dev against
trunk.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message