You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2012/06/07 23:25:37 UTC

svn commit: r1347804 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/src/site/

Author: todd
Date: Thu Jun  7 21:25:34 2012
New Revision: 1347804

URL: http://svn.apache.org/viewvc?rev=1347804&view=rev
Log:
Merge HDFS-3042 (automatic failover) to branch-2 from trunk

Modified:
    hadoop/common/branches/branch-2/   (props changed)
    hadoop/common/branches/branch-2/hadoop-project/   (props changed)
    hadoop/common/branches/branch-2/hadoop-project/src/site/   (props changed)

Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/HDFS-3042:r1306184-1342109
  Merged /hadoop/common/trunk:r1342112

Propchange: hadoop/common/branches/branch-2/hadoop-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-project:r1342112

Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-project/src/site:r1342112