diff options
| author | Aaron Davidson <aaron@databricks.com> | 2013-11-14 22:13:09 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2013-11-14 22:13:09 -0800 |
| commit | f629ba95b6a1a3508463bfdcb03efcfaa3327cb5 (patch) | |
| tree | 74a4cbcd839471d8c4248c9615f5803fad28787d /docs | |
| parent | d4cd32330e1e4ac83b38bc922a9d3fd85f85f606 (diff) | |
| download | spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.tar.gz spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.tar.bz2 spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.zip | |
Various merge corrections
I've diff'd this patch against my own -- since they were both created
independently, this means that two sets of eyes have gone over all the
merge conflicts that were created, so I'm feeling significantly more
confident in the resulting PR.
@rxin has looked at the changes to the repl and is resoundingly
confident that they are correct.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hadoop-third-party-distributions.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hadoop-third-party-distributions.md b/docs/hadoop-third-party-distributions.md index f706625fe9..b33af2cf24 100644 --- a/docs/hadoop-third-party-distributions.md +++ b/docs/hadoop-third-party-distributions.md @@ -25,8 +25,8 @@ the _exact_ Hadoop version you are running to avoid any compatibility errors. <h3>CDH Releases</h3> <table class="table" style="width:350px; margin-right: 20px;"> <tr><th>Release</th><th>Version code</th></tr> - <tr><td>CDH 4.X.X (YARN mode)</td><td>2.0.0-chd4.X.X</td></tr> - <tr><td>CDH 4.X.X</td><td>2.0.0-mr1-chd4.X.X</td></tr> + <tr><td>CDH 4.X.X (YARN mode)</td><td>2.0.0-cdh4.X.X</td></tr> + <tr><td>CDH 4.X.X</td><td>2.0.0-mr1-cdh4.X.X</td></tr> <tr><td>CDH 3u6</td><td>0.20.2-cdh3u6</td></tr> <tr><td>CDH 3u5</td><td>0.20.2-cdh3u5</td></tr> <tr><td>CDH 3u4</td><td>0.20.2-cdh3u4</td></tr> |