falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [2/4] git commit: FALCON-828 Add hadoop version info as part of falcon admin version API. Contributed by Venkatesh Seetharam
Date Mon, 27 Oct 2014 03:55:41 GMT
FALCON-828 Add hadoop version info as part of falcon admin version API. Contributed by Venkatesh
Seetharam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/73269d23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/73269d23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/73269d23

Branch: refs/heads/master
Commit: 73269d2373fde667694ff432a3ef97efa07a2219
Parents: cdb6b94
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Sun Oct 26 20:10:46 2014 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Sun Oct 26 20:10:46 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                   | 3 +++
 .../java/org/apache/falcon/resource/admin/AdminResource.java  | 7 +++++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73269d23/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e0960c..fdeff18 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -37,6 +37,9 @@ Trunk (Unreleased)
    FALCON-263 API to get workflow parameters. (pavan kumar kolamuri via Shwetha GS)
 
   IMPROVEMENTS
+   FALCON-828 Add hadoop version info as part of falcon admin version API
+   (Venkatesh Seetharam)
+
    FALCON-762 Support feed listing for file system storage (Srikanth Sundarrajan)
 
    FALCON-20 Remove dependency on custom InMobi DistCp (Sowmya Ramesh via

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73269d23/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java b/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
index 41fb1c7..2798534 100644
--- a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
+++ b/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
@@ -23,6 +23,7 @@ import org.apache.falcon.util.BuildProperties;
 import org.apache.falcon.util.DeploymentProperties;
 import org.apache.falcon.util.RuntimeProperties;
 import org.apache.falcon.util.StartupProperties;
+import org.apache.hadoop.util.VersionInfo;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -83,9 +84,15 @@ public class AdminResource {
             property.value = DeploymentProperties.get().getProperty("deploy.mode");
             props.add(property);
 
+            property = new Property();
+            property.key = "Hadoop";
+            property.value = VersionInfo.getVersion() + "-r" + VersionInfo.getRevision();
+            props.add(property);
+
             version = new PropertyList();
             version.properties = props;
         }
+
         return version;
     }
 


Mime
View raw message