Return-Path: X-Original-To: apmail-incubator-ambari-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5AEB9100FB for ; Wed, 17 Jul 2013 20:29:47 +0000 (UTC) Received: (qmail 52847 invoked by uid 500); 17 Jul 2013 20:29:46 -0000 Delivered-To: apmail-incubator-ambari-dev-archive@incubator.apache.org Received: (qmail 52818 invoked by uid 500); 17 Jul 2013 20:29:46 -0000 Mailing-List: contact ambari-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-dev@incubator.apache.org Received: (qmail 52775 invoked by uid 99); 17 Jul 2013 20:29:46 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 20:29:46 +0000 Date: Wed, 17 Jul 2013 20:29:46 +0000 (UTC) From: "Nate Cole (JIRA)" To: ambari-dev@incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (AMBARI-2677) Merge branch-1.4.0 to trunk MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/AMBARI-2677?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13711575#comment-13711575 ] Nate Cole commented on AMBARI-2677: ----------------------------------- {noformat} [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Ambari Main ....................................... SUCCESS [2.403s] [INFO] Apache Ambari Project POM ......................... SUCCESS [0.235s] [INFO] Ambari Web ........................................ SUCCESS [12.946s] [INFO] Ambari Server ..................................... SUCCESS [8:39.535s] [INFO] Ambari Agent ...................................... SUCCESS [1:02.485s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 9:58.089s [INFO] Finished at: Wed Jul 17 16:25:28 EDT 2013 [INFO] Final Memory: 41M/123M [INFO] ------------------------------------------------------------------------ {noformat} > Merge branch-1.4.0 to trunk > --------------------------- > > Key: AMBARI-2677 > URL: https://issues.apache.org/jira/browse/AMBARI-2677 > Project: Ambari > Issue Type: Bug > Components: agent, client, controller > Reporter: Nate Cole > Assignee: Nate Cole > Fix For: 1.4.0 > > Attachments: AMBARI-2677.patch > > > Merge Ambari 1.4.0 branch to Ambari trunk, so that both hadoop 2.0 and hadoop 1.0 is supported in one line. > We need to merge the 2 branches (this might be quite some effort). Also we need to make after the merge both 1.0 and 2.0 line work. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira