kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: HOTFIX: Remove git conflict markers in streams.html
Date Wed, 28 Sep 2016 01:32:03 GMT
Repository: kafka
Updated Branches:
  refs/heads/0.10.0 64acd9085 -> 8bbb0b216


HOTFIX: Remove git conflict markers in streams.html

Author: Guozhang Wang <wangguoz@gmail.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #1922 from guozhangwang/KHotfix-streams-html


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

Branch: refs/heads/0.10.0
Commit: 8bbb0b216fe2573c1f9716bcdb1021daf784968a
Parents: 64acd90
Author: Guozhang Wang <wangguoz@gmail.com>
Authored: Wed Sep 28 02:31:58 2016 +0100
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Wed Sep 28 02:31:58 2016 +0100

----------------------------------------------------------------------
 docs/streams.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/8bbb0b21/docs/streams.html
----------------------------------------------------------------------
diff --git a/docs/streams.html b/docs/streams.html
index 6b76010..7321ca9 100644
--- a/docs/streams.html
+++ b/docs/streams.html
@@ -298,11 +298,8 @@ based on them.
 
 <pre>
     // written in Java 8+, using lambda expressions
-<<<<<<< HEAD
+
     KTable<Windowed<String>, Long> counts = source1.aggregateByKey(
-=======
-    KTable<Windowed<String>, Long> counts = source1.groupByKey().aggregate(
->>>>>>> 268cff7... KAFKA-4112: Remove alpha quality label from Kafka
Streams in docs
         () -> 0L,  // initial value
         (aggKey, value, aggregate) -> aggregate + 1L,   // aggregating value
         TimeWindows.of("counts",5000L).advanceBy(1000L), // intervals in milliseconds


Mime
View raw message