You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/03/08 19:02:58 UTC
[1/3] storm git commit: return grep matches each on its own line
Repository: storm
Updated Branches:
refs/heads/master 9517923b1 -> 30a013021
return grep matches each on its own line
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4f468d91
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4f468d91
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4f468d91
Branch: refs/heads/master
Commit: 4f468d91494811f22f82154698317e7ed7cabf29
Parents: be64b25
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri Feb 6 17:47:06 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri Feb 6 17:47:06 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4f468d91/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
index f2a5b0a..7af1d5d 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -273,8 +273,9 @@ Note that if anything goes wrong, this will throw an Error and exit."
(if grep
(html [:pre#logContent
(if grep
- (filter #(.contains % grep)
- (.split log-string "\n"))
+ (->> (.split log-string "\n")
+ (filter #(.contains % grep))
+ (string/join "\n"))
log-string)])
(let [pager-data (pager-links fname start length file-length)]
(html (concat pager-data
[3/3] storm git commit: Added STORM-659 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-659 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/30a01302
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/30a01302
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/30a01302
Branch: refs/heads/master
Commit: 30a013021931e7e2b7fec56a6d90619e1359873f
Parents: d5dcf0d
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Mar 8 11:02:12 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Mar 8 11:02:12 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/30a01302/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9de6e06..8250eab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
## 0.10.0
+ * STORM-659: return grep matches each on its own line.
+ * STORM-693: KafkaBolt exception handling improvement.
* STORM-675: Allow users to have storm-env.sh under config dir to set custom JAVA_HOME and other env variables.
* STORM-539: Storm Hive Connector.
* STORM-616: Storm JDBC Connector.
[2/3] storm git commit: Merge branch 'storm-659-grep-match-lines' of
https://github.com/d2r/storm into STORM-659
Posted by sr...@apache.org.
Merge branch 'storm-659-grep-match-lines' of https://github.com/d2r/storm into STORM-659
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d5dcf0db
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d5dcf0db
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d5dcf0db
Branch: refs/heads/master
Commit: d5dcf0dbdc1c815dcb8b8920c4ff7ce78c7d7749
Parents: 9517923 4f468d9
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Mar 8 10:53:51 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Mar 8 10:53:51 2015 -0700
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------