Repository: apex-core
Updated Branches:
  refs/heads/master e4af896cb -> c52e17bac


APEXCORE-687 change supported Hadoop v2.6 in docs


Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/c52e17ba
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/c52e17ba
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/c52e17ba

Branch: refs/heads/master
Commit: c52e17bac350f8abb31e894ff130198140bcda2d
Parents: e4af896
Author: Dean Lockgaard <[email protected]>
Authored: Fri Apr 14 10:14:28 2017 +0900
Committer: Dean Lockgaard <[email protected]>
Committed: Fri Apr 14 10:14:28 2017 +0900

----------------------------------------------------------------------
 docs/application_development.md | 14 +++++++-------
 docs/compatibility.md           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/apex-core/blob/c52e17ba/docs/application_development.md
----------------------------------------------------------------------
diff --git a/docs/application_development.md b/docs/application_development.md
index 07cfd81..22fc6d2 100644
--- a/docs/application_development.md
+++ b/docs/application_development.md
@@ -693,7 +693,7 @@ submitted to the Hadoop cluster and executes as a  
multi-processapplication on 
 
 
 Before you start deploying, testing and troubleshooting your
-application on a cluster, you should ensure that Hadoop (version 2.2.0
+application on a cluster, you should ensure that Hadoop (version 2.6.0
 or later) is properly installed and
 you have basic skills for working with it.
 
@@ -917,8 +917,8 @@ educate the reader on Hadoop, but just get the reader 
acquainted with
 the terms. We strongly advise readers to learn Hadoop from other
 sources.
 
-A streaming application runs as a native Hadoop 2.2 application.
-Hadoop 2.2 does not differentiate between a map-reduce job and other
+A streaming application runs as a native Hadoop 2.x application.
+Hadoop 2.x does not differentiate between a map-reduce job and other
 applications, and hence as far as Hadoop is concerned, the streaming
 application is just another job. This means that your application
 leverages all the bells and whistles Hadoop provides and is fully
@@ -937,9 +937,9 @@ Hadoop.
 ### YARN
 
 [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site)is
-the core library of Hadoop 2.2 that is tasked with resource management
+the core library of Hadoop 2.x that is tasked with resource management
 and works as a distributed application framework. In this section we
-will walk through Yarn's components. In Hadoop 2.2, the old jobTracker
+will walk through Yarn's components. In Hadoop 2.x, the old jobTracker
 has been replaced by a combination of ResourceManager (RM) and
 ApplicationMaster (AM).
 
@@ -962,8 +962,8 @@ interacting with NodeManagers to get the allocated 
containers started.
 The AM is the starting point of your application and is considered user
 code (not system Hadoop code). The AM itself runs in one container. All
 resource management within the application are managed by the AM. This
-is a critical feature for Hadoop 2.2 where tasks done by jobTracker in
-Hadoop 1.0 have been distributed allowing Hadoop 2.2 to scale much
+is a critical feature for Hadoop 2.x where tasks done by jobTracker in
+Hadoop 1.0 have been distributed allowing Hadoop 2.x to scale much
 beyond Hadoop 1.0. STRAM is a native YARN ApplicationManager.
 
 #### Node Managers (NM)

http://git-wip-us.apache.org/repos/asf/apex-core/blob/c52e17ba/docs/compatibility.md
----------------------------------------------------------------------
diff --git a/docs/compatibility.md b/docs/compatibility.md
index 3e62657..17e4a1f 100644
--- a/docs/compatibility.md
+++ b/docs/compatibility.md
@@ -103,7 +103,7 @@ The artifacts that contain the classes that form the public 
API as specified abo
 
 ###Hardware/Software Requirements
 
-Apex depends on Apache Hadoop. The community intends to support all major 
Hadoop distros and current versions. Apex currently supports Hadoop 2.2.0 and 
higher and Java 7 and higher. Apex is written in Java and has been tested on 
Linux based Hadoop clusters. There are no additional restrictions on the 
hardware architecture.  
+Apex depends on Apache Hadoop. The community intends to support all major 
Hadoop distros and current versions. Apex currently supports Hadoop 2.6.0 and 
higher and Java 7 and higher. Apex is written in Java and has been tested on 
Linux based Hadoop clusters. There are no additional restrictions on the 
hardware architecture.
 
 To keep up with the latest advances in hardware, operating systems, JVMs, 
Hadoop and other software, new Apex releases may require higher versions. 
Upgrading Apex may require upgrading other dependent software components.
 

Reply via email to