You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/06 20:25:19 UTC

[1/4] storm git commit: FLUX logo wasn't appearing quite right;

Repository: storm
Updated Branches:
  refs/heads/master 4fe62b2ca -> fe65176a1


FLUX logo wasn't appearing quite right;


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

Branch: refs/heads/master
Commit: b8b2e16374b3f10e81b6bbc6daab5f318b813146
Parents: d59eaac
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Thu Oct 29 16:48:50 2015 -0500
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Fri Nov 6 10:24:57 2015 -0600

----------------------------------------------------------------------
 .../flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b8b2e163/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java b/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
index 6300631..71c20a7 100644
--- a/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
+++ b/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
@@ -253,7 +253,8 @@ public class Flux {
         // banner
         InputStream is = Flux.class.getResourceAsStream("/splash.txt");
         if(is != null){
-            BufferedReader br = new BufferedReader(new InputStreamReader(is));
+            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+            BufferedReader br = new BufferedReader(isr);
             String line = null;
             while((line = br.readLine()) != null){
                 System.out.println(line);


[3/4] storm git commit: Added STORM-1180 to Changelog

Posted by bo...@apache.org.
Added STORM-1180 to Changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8fd08b8d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8fd08b8d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8fd08b8d

Branch: refs/heads/master
Commit: 8fd08b8d7573de819d4bf0167cd33ac4a806d078
Parents: 2d8cd8d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Nov 6 13:10:44 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Nov 6 13:10:44 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/8fd08b8d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fed12b..85bc2ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1180: FLUX logo wasn't appearing quite right
  * STORM-1138: Storm-hdfs README should be updated with Avro Bolt information
  * STORM-1154: SequenceFileBolt needs unit tests
  * STORM-162: Load Aware Shuffle Grouping


[4/4] storm git commit: Added STORM-1180 to Readme

Posted by bo...@apache.org.
Added STORM-1180 to Readme


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

Branch: refs/heads/master
Commit: fe65176a1a7ee27715640a88fb3a831fbe2533a5
Parents: 8fd08b8
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Nov 6 13:11:59 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Nov 6 13:11:59 2015 -0600

----------------------------------------------------------------------
 README.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/fe65176a/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 3f66e42..866cf9b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -237,7 +237,8 @@ under the License.
 * Pete Prokopowicz ([@prokopowicz](https://github.com/prokopowicz))
 * Priyank Shah ([@priyank5485](https://github.com/priyank5485))
 * Joshua Martell ([@jmartell7](https://github.com/jmartell7))
-* Matthew Tieman ([@mjtieman](https://github.com/mjtieman)])
+* Matthew Tieman ([@mjtieman](https://github.com/mjtieman))
+* Chuck Burgess ([@ashnazg](https://github.com/ashnazg))
 
 ## Acknowledgements
 


[2/4] storm git commit: Merge branch 'utf8splash' of https://github.com/ashnazg/storm into STORM-1180

Posted by bo...@apache.org.
Merge branch 'utf8splash' of https://github.com/ashnazg/storm into STORM-1180

STORM-1180: FLUX logo wasn't appearing quite right


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2d8cd8d3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2d8cd8d3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2d8cd8d3

Branch: refs/heads/master
Commit: 2d8cd8d3d663610114edeabf5622e558ace3675b
Parents: 4fe62b2 b8b2e16
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Nov 6 13:10:20 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Nov 6 13:10:20 2015 -0600

----------------------------------------------------------------------
 .../flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------