Skip to content

Commit ac91dd0

Browse files
committed
merging master
2 parents bc9f486 + 12037fe commit ac91dd0

File tree

4 files changed

+178
-112
lines changed

4 files changed

+178
-112
lines changed

dictionary.txt

Lines changed: 64 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,66 +2,46 @@
22
.inRadius
33
01FY9MWDTWW4XQNTPJ9XY9FPMN
44
30Mb
5-
Analytics
6-
analytics
7-
anonymized
85
APIs
9-
atomicity
6+
Analytics
107
CLI
118
CLI-based
9+
CMS
10+
CO2
11+
CRM
1212
Caskroom
1313
CentOS7
1414
Centos8
15-
CO2
1615
CommandLineRunner
1716
Config
18-
CMS
19-
CRM
2017
CrudRepository
21-
Cypher
22-
datacenters
23-
datastore
24-
deserialize
25-
deserialized
26-
DNS
27-
Dotenv
28-
Downey
29-
EntityStream
30-
ETL
31-
FTS
32-
geo-distributed
33-
consumer1
34-
consumer2
35-
consumer3
36-
consumer:lastid
37-
consumergroup
3818
CrudRepository
3919
Cypher
40-
datacenter
41-
dataset
20+
Cypher
21+
DNS
4222
DevOps
4323
Dotenv
24+
Dotenv
25+
Downey
4426
Downey
27+
ETL
28+
EntityStream
4529
EntityStream
30+
FTS
4631
GCP
47-
geo-distributed
48-
geo-distribution
4932
GeoLocation
50-
geo-replicated
5133
Geospatial
5234
Github
5335
Hemsworth
5436
Homebrew
5537
HyperLogLog
5638
HyperLogLogs
5739
IAM
58-
Initializer
59-
IoT
6040
IPs
6141
IaaS
62-
inferencing
6342
Initializer
64-
integrations
43+
Initializer
44+
IoT
6545
Iterable
6646
JSON
6747
Jedis
@@ -72,81 +52,84 @@ Kubernetes
7252
Kubernetes-based
7353
LICENSOR
7454
LINQ
55+
LTS
7556
Licensor
7657
Licensor.
7758
Lombok
78-
LTS
7959
M1
80-
MacOS
8160
MERCHANTABILITY
82-
multicloud
83-
Multicloud
8461
MVC
85-
mystream
86-
npm
87-
on-prem
62+
MacOS
63+
Multicloud
8864
ORM
8965
OSS
9066
PeopleController
9167
PeopleControllerV1
9268
PeopleRepository
9369
PeopleService
9470
PowerShell
95-
product-lifecycle
9671
Profiler
9772
Pydantic
98-
queryable
9973
Queryable
10074
README
10175
REDISTIMESERIES_ARGS
10276
REDIS_ARGS
103-
RedisAI
104-
RedisGears
10577
REDiss
78+
REPL
79+
REPL
10680
RHEL7
10781
RHEL8
10882
RSAL
83+
RSALv2
10984
RediSearch
85+
RedisAI
11086
RedisBloom
11187
RedisConnectionProvider
11288
RedisDocumentRepository
89+
RedisGears
11390
RedisGraph
11491
RedisInsight
11592
RedisJSON
11693
RedisTimeSeries
117-
REPL
118-
SaaS
11994
SDK
12095
SKU
12196
SMS
12297
SRANDMEMBER
12398
SSPL
99+
SSPLv1
100+
SaaS
124101
Scarlett
125102
SkeletonApplication
126103
Slowlog
104+
Slowlog
127105
SortOrder.ASC
128106
Springfox
129107
Stapleton's
130108
Sublicensing
131109
SwaggerUI
132110
Systemd
133-
tiering
134-
TTL
135111
TShark
112+
TTL
113+
Telecom
114+
TimeSeries
136115
UI
137116
ULID
138117
ULIDs
139118
Unlink
140-
Wireshark
141-
uptime
142119
WSL
120+
Wireshark
143121
XADD
122+
XDEL
123+
XLEN
144124
Xenial
145125
YAML
126+
analytics
146127
anonymised
128+
anonymized
147129
api
148130
args
149131
async
132+
atomicity
150133
autogenerated
151134
backend
152135
basePackages
@@ -162,13 +145,25 @@ coladas
162145
comin
163146
config
164147
const
148+
consumer1
149+
consumer2
150+
consumer3
151+
consumer:lastid
152+
consumergroup
165153
createClient
154+
datacenter
155+
datacenters
156+
dataset
166157
dataset
158+
datastore
167159
david-paich.json
168160
dearmor
161+
deserialize
162+
deserialized
169163
devtools
170164
dotenv
171165
dr
166+
dually
172167
entityId
173168
entityStream
174169
epel-release
@@ -182,8 +177,12 @@ findBySkills
182177
firstName
183178
fsSL
184179
geo
185-
geofilter
180+
geo-distributed
181+
geo-distributed
182+
geo-distribution
186183
geo-location
184+
geo-replicated
185+
geofilter
187186
getters
188187
gpg
189188
gpgcheck=1
@@ -193,18 +192,22 @@ homebrew
193192
hostname
194193
houseNumber
195194
http
195+
inferencing
196196
ingest:temphumidity
197197
instantiation
198+
integrations
198199
javascript
199-
joan-jett.json
200200
jedis
201+
joan-jett.json
201202
json
202203
justin-timberlake.json
203204
kerry-livgren.json
204205
keyName
205206
keyrings
206207
lastName
207208
latencies
209+
licensor
210+
licensor's
208211
linkTitle
209212
loadTestData
210213
localhost
@@ -219,10 +222,14 @@ lsb_release
219222
macOS
220223
maxAge
221224
minAge
225+
multicloud
222226
mvnw
227+
mystream
223228
namespaces
224229
node-redis
225230
nostem
231+
npm
232+
on-prem
226233
openssl
227234
personRepository
228235
personRouter
@@ -231,7 +238,9 @@ personalStatement
231238
piña
232239
postalCode
233240
predictively
241+
product-lifecycle
234242
profiler
243+
queryable
235244
redis
236245
redis-benchmark
237246
redis-cli
@@ -267,22 +276,18 @@ swaggerUi
267276
symlink
268277
symlinked
269278
telecom
270-
Telecom
271-
TimeSeries
272-
tl
273279
temphumidity_consumers
280+
tiering
281+
tl
274282
tmp
275283
typesafe
276284
untap
277285
untarring
278286
uptime
287+
uptime
279288
url
280289
usr
281290
v1
282291
x86
283-
XDEL
284-
XLEN
285292
xml
286293
zshrc
287-
REPL
288-
Slowlog

docs/stack/_index.md

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The overarching vision is to provide developers with a powerful platform for all
3030
Redis beyond caching, Redis Stack is the place to start. Redis Stack delivers the core capabilities developers love about Redis and goes beyond
3131
to help you build modern applications where performance is paramount.
3232

33-
## Redis Stack Packaging
33+
## Redis Stack packaging
3434

3535
There are three distinct Redis Stack packages to choose from:
3636

@@ -53,7 +53,7 @@ To get started with Redis Stack, see the [Getting Started](/docs/stack/get-start
5353
* [See the list of clients supporting Redis Stack](/docs/stack/get-started/clients/)
5454
* [View the Redis Stack tutorials](/docs/stack/get-started/tutorials/)
5555

56-
### Use cases
56+
## Use cases
5757

5858
Explore [use cases](/docs/stack/use-cases/) of the applied modern data models and processing engines provided by Redis Stack across industries and applications.
5959

@@ -63,12 +63,12 @@ Modules as described here are generic, and we list only the representative use c
6363

6464
{{% /alert %}}
6565

66-
### Clients
66+
## Clients
6767

6868
Several Redis client libraries support Redis Stack. These include [redis-py](https://redis-py.readthedocs.io/en/stable/), [node_redis](https://github.com/redis/node-redis), and [Jedis](https://github.com/redis/jedis). In addition, four higher-level object
6969
mapping libraries also support Redis Stack: [Redis OM .NET](/docs/stack/get-started/tutorials/stack-dotnet/), [Redis OM Node](/docs/stack/get-started/tutorials/stack-node/), [Redis OM Python](/docs/stack/get-started/tutorials/stack-python/), [Redis OM Spring](/docs/stack/get-started/tutorials/stack-spring/).
7070

71-
### RedisInsight
71+
## RedisInsight
7272

7373
Redis Stack also includes [RedisInsight](https://docs.redis.com/latest/ri/), a visualization tool for understanding and optimizing Redis data.
7474

@@ -82,12 +82,54 @@ RedisInsight allows you to:
8282
* Edit the configuration of your Redis instance with the Configuration tool
8383
* and more...
8484

85-
8685
## Redis Stack license
8786

8887
Redis Stack is made up of several components, licensed as follows:
8988

90-
* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is licensed
91-
* under the [Redis Source Available License](https://github.com/RediSearch/RediSearch/blob/master/LICENSE) (RSAL).
89+
* Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom, is dual-licensed under the Redis Source Available License ([RSALv2]((/docs/stack/license/)) and the [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL). A breakdown of licensing by Stack component versions is shown in the table below. For more information about Redis licensing, see [Licenses](https://redis.com/legal/licenses/).
90+
91+
* RedisInsight is licensed under the SSPL.
92+
93+
### Versions and licenses
94+
95+
Starting November 15, 2022, our default binary distributions of Redis Stack and our Redis modules have been dual-licensed under RSALv2 and SSPL. When using the source code, you can apply either RSALv2 or SSPLv1.
96+
97+
<table>
98+
<tr>
99+
<th>Module</th>
100+
<th>RSALv1</th>
101+
<th>Binary distribution: RSALv2</br>
102+
Source code: RSALv2 or SSPLv1</th>
103+
</tr>
104+
<tr>
105+
<td>Redis Stack</td>
106+
<td><= 6.2.4</td>
107+
<td>>= 6.2.6</td>
108+
</tr>
109+
<tr>
110+
<td>RediSearch</td>
111+
<td><= 2.4</td>
112+
<td>>= 2.6</td>
113+
</tr>
114+
<tr>
115+
<td>RedisJSON</td>
116+
<td><= 2.2</td>
117+
<td>>= 2.4</td>
118+
</tr>
119+
<tr>
120+
<td>RedisGraph</td>
121+
<td><=2.8</td>
122+
<td>>=2.10</td>
123+
</tr>
124+
<tr>
125+
<td>RedisTimeSeries</td>
126+
<td><=1.6</td>
127+
<td>>= 1.8</td>
128+
</tr>
129+
<tr>
130+
<td>RedisBloom</td>
131+
<td><= 2.2</td>
132+
<td>>=2.4</td>
133+
</tr>
134+
</table>
92135

93-
* RedisInsight is licensed under the [Server Side Public License](https://en.wikipedia.org/wiki/Server_Side_Public_License) (SSPL).

0 commit comments

Comments
 (0)