You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/19 21:24:28 UTC

[1/2] incubator-streams git commit: this configuration file moved

Repository: incubator-streams
Updated Branches:
  refs/heads/master 79c5e2b2c -> 3400ce2b7


this configuration file moved


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/16bff16a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/16bff16a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/16bff16a

Branch: refs/heads/master
Commit: 16bff16ab35f4e699eba9420e343347c3104748e
Parents: d0b5a0a
Author: sblackmon <sb...@apache.org>
Authored: Tue Nov 18 12:27:59 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Tue Nov 18 12:27:59 2014 -0600

----------------------------------------------------------------------
 .../java/org/apache/streams/storm/trident/StreamsTopology.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/16bff16a/streams-runtimes/streams-runtime-storm/src/main/java/org/apache/streams/storm/trident/StreamsTopology.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-storm/src/main/java/org/apache/streams/storm/trident/StreamsTopology.java b/streams-runtimes/streams-runtime-storm/src/main/java/org/apache/streams/storm/trident/StreamsTopology.java
index 63c64a5..0bc97bd 100644
--- a/streams-runtimes/streams-runtime-storm/src/main/java/org/apache/streams/storm/trident/StreamsTopology.java
+++ b/streams-runtimes/streams-runtime-storm/src/main/java/org/apache/streams/storm/trident/StreamsTopology.java
@@ -19,7 +19,7 @@
 package org.apache.streams.storm.trident;
 
 import backtype.storm.Config;
-import org.apache.streams.StreamsConfiguration;
+import org.apache.streams.config.StreamsConfiguration;
 import org.apache.streams.config.StreamsConfigurator;
 import storm.trident.TridentTopology;
 


[2/2] incubator-streams git commit: Merge branch 'STREAMS-215.2'

Posted by sb...@apache.org.
Merge branch 'STREAMS-215.2'


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3400ce2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3400ce2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3400ce2b

Branch: refs/heads/master
Commit: 3400ce2b776bab92c328a31e7a8a1c87c56a6cf0
Parents: 79c5e2b 16bff16
Author: sblackmon <sb...@apache.org>
Authored: Wed Nov 19 14:24:17 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Wed Nov 19 14:24:17 2014 -0600

----------------------------------------------------------------------
 .../java/org/apache/streams/storm/trident/StreamsTopology.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------