Return-Path: 
 <commits-return-3331-apmail-hama-commits-archive=hama.apache.org@hama.apache.org>
X-Original-To: apmail-hama-commits-archive@www.apache.org
Delivered-To: apmail-hama-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F20491768E
	for <apmail-hama-commits-archive@www.apache.org>;
 Tue, 17 Mar 2015 01:48:39 +0000 (UTC)
Received: (qmail 81325 invoked by uid 500); 17 Mar 2015 01:48:39 -0000
Delivered-To: apmail-hama-commits-archive@hama.apache.org
Received: (qmail 81296 invoked by uid 500); 17 Mar 2015 01:48:39 -0000
Mailing-List: contact commits-help@hama.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hama.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hama.apache.org>
List-Post: <mailto:commits@hama.apache.org>
List-Id: <commits.hama.apache.org>
Reply-To: dev@hama.apache.org
Delivered-To: mailing list commits@hama.apache.org
Received: (qmail 81285 invoked by uid 99); 17 Mar 2015 01:48:39 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Mar 2015 01:48:39 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 B17B4AC0163
	for <commits@hama.apache.org>; Tue, 17 Mar 2015 01:48:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1667160 - /hama/trunk/pom.xml
Date: Tue, 17 Mar 2015 01:48:39 -0000
To: commits@hama.apache.org
From: edwardyoon@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150317014839.B17B4AC0163@hades.apache.org>

Author: edwardyoon
Date: Tue Mar 17 01:48:39 2015
New Revision: 1667160

URL: http://svn.apache.org/r1667160
Log:
HAMA-934: Make Hadoop2 profile default

Modified:
    hama/trunk/pom.xml

Modified: hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hama/trunk/pom.xml?rev=1667160&r1=1667159&r2=1667160&view=diff
==============================================================================
--- hama/trunk/pom.xml (original)
+++ hama/trunk/pom.xml Tue Mar 17 01:48:39 2015
@@ -127,9 +127,6 @@
   <profiles>
     <profile>
       <id>hadoop1</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       
       <modules>
         <module>c++</module>
@@ -159,8 +156,11 @@
     <profile>
       <id>hadoop2</id>
       <properties>
-        <hadoop.version>2.5.0</hadoop.version>
+        <hadoop.version>2.6.0</hadoop.version>
       </properties>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
 
       <modules>
         <module>c++</module>