Skip to content

Commit

Permalink
Manual merge from 5.1.x to master
Browse files Browse the repository at this point in the history
  • Loading branch information
JimGalasyn committed Dec 14, 2018
2 parents 05d3daf + 43021ca commit c0cd57f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

> **KSQL is now GA and officially supported by Confluent Inc. [Get started with KSQL today](#getting-started).**
KSQL is the streaming SQL engine for Apache Kafka.

KSQL is an open source streaming SQL engine for Apache Kafka. It provides a simple and completely interactive SQL interface for stream processing on Kafka; no need to write code in a programming language such as Java or Python. KSQL is open-source (Apache 2.0 licensed), distributed, scalable, reliable, and real-time. It supports a wide range of powerful stream processing operations including aggregations, joins, windowing, sessionization, and much more. You can find [more KSQL tutorials and resources here](https://confluent.io/ksql) if you are interested.
KSQL is the streaming SQL engine for Apache Kafka. It provides a simple and completely interactive SQL interface for stream processing on Kafka; no need to write code in a programming language such as Java or Python. KSQL is distributed, scalable, reliable, and real-time. It supports a wide range of powerful stream processing operations including aggregations, joins, windowing, sessionization, and much more. You can find [more KSQL tutorials and resources here](https://confluent.io/ksql) if you are interested.

Click here to watch a screencast of the KSQL demo on YouTube.
<a href="https://www.youtube.com/watch?v=illEpCOcCVg" target="_blank"><img src="screencast.jpg" alt="KSQL screencast"></a></p>
Expand Down
Binary file modified docs/img/ksql-architecture-and-components.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ KSQL
What Is KSQL?
-------------

KSQL is the open source streaming SQL engine for Apache Kafka\ :sup:`®`\ . It provides an easy-to-use yet powerful interactive SQL
KSQL is the streaming SQL engine for Apache Kafka\ :sup:`®`\ . It provides an easy-to-use yet powerful interactive SQL
interface for stream processing on Kafka, without the need to write code in a programming language such as Java or
Python. KSQL is scalable, elastic, fault-tolerant, and real-time. It supports a wide range of streaming operations,
including data filtering, transformations, aggregations, joins, windowing, and sessionization.
Expand Down

0 comments on commit c0cd57f

Please sign in to comment.