removing read-storm-version function, fixing a typo in ui.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a8aacca6 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a8aacca6 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a8aacca6 Branch: refs/heads/nimbus-ha-branch Commit: a8aacca6444a30638162ac27f8c7213a4a96aed1 Parents: 23ed537 Author: Parth Brahmbhatt <[email protected]> Authored: Thu Feb 12 16:44:52 2015 -0800 Committer: Parth Brahmbhatt <[email protected]> Committed: Thu Feb 12 16:44:52 2015 -0800 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/config.clj | 10 ---------- .../src/ui/public/templates/index-page-template.html | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/a8aacca6/storm-core/src/clj/backtype/storm/config.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/config.clj b/storm-core/src/clj/backtype/storm/config.clj index f3c70e5..a6b160d 100644 --- a/storm-core/src/clj/backtype/storm/config.clj +++ b/storm-core/src/clj/backtype/storm/config.clj @@ -282,13 +282,3 @@ (defn ^LocalState worker-state [conf id] (LocalState. (worker-heartbeats-root conf id))) - -(defn read-storm-version - "Returns a string containing the Storm version or 'Unknown'." - [] - (let [storm-home (System/getProperty "storm.home") - release-path (format "%s/RELEASE" storm-home) - release-file (File. release-path)] - (if (and (.exists release-file) (.isFile release-file)) - (str/trim (slurp release-path)) - "Unknown"))) http://git-wip-us.apache.org/repos/asf/storm/blob/a8aacca6/storm-core/src/ui/public/templates/index-page-template.html ---------------------------------------------------------------------- diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html index eb4581a..84da576 100644 --- a/storm-core/src/ui/public/templates/index-page-template.html +++ b/storm-core/src/ui/public/templates/index-page-template.html @@ -83,10 +83,10 @@ <span class="tip above" title="True if this host is leader, false otherwise.">IsLeader</span> </th> <th> - <span class="tip left" title="Storm version that this nimbus host is running.">Version</span> + <span class="tip left" title="Storm version this nimbus host is running.">Version</span> </th> <th> - <span class="tip left" title="Number of seconds this nimbus host has been running the nimbus process.">UpTime Seconds</span> + <span class="tip left" title="Time since this nimbus host has been running.">UpTime Seconds</span> </th> </tr> </thead>
