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/23 21:12:00 UTC
[15/28] incubator-streams git commit: fixed mergeMerge branch
'master' into STREAMS-68, 218
fixed mergeMerge branch 'master' into STREAMS-68,218
Conflicts:
streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3b413557
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3b413557
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3b413557
Branch: refs/heads/master
Commit: 3b4135574735359ad819a1486fdd750387662f15
Parents: ce2a794
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Sat Nov 15 19:11:41 2014 -0600
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Sat Nov 15 19:11:41 2014 -0600
----------------------------------------------------------------------
.../apache/streams/facebook/api/FacebookPostActivityConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3b413557/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java
index a41c405..db6f369 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java
@@ -31,7 +31,7 @@ import org.joda.time.format.ISODateTimeFormat;
import java.util.List;
-public class FacebookPostActivitySerializer implements ActivitySerializer<org.apache.streams.facebook.Post> {
+public class FacebookPostActivityConverter implements ActivityConverter<Post> {
public FacebookPostActivityConverter() {