Commit Graph

Select branches

Hide Pull Requests

32bit-fix

6.2.2_merge

AIO

RELEASE_0_9

RELEASE_5

RELEASE_6

RELEASE_6_3

RELEASE_6_3_2

RELEASE_6_3_3

RELEASE_6_3_4

Redis_626_Merge_Testing

add_keydb_var_lua

add_s3_config

advanced_db

aflash_package_update

alpine_fixes

alpine_testfix

always_lock_expireset

aof_fixes

async_flash

async_rehash

backport_from_release

backtrace_for_alpine

bfed57e3

bitoprange

bldtest

ci-flags-fix

ci_fixes

client_disable

compile_fixes

complete_fix_rdb_hang

crash_on_bad_multimaster_config

diagnostic-tool

disable_key_cache_config

exclude_base_repl_buffer_from_overhead

fast_flash

fix_active_defrag

fix_apine

fix_bad_merge

fix_blocked_client_timeout_crash

fix_cluster_fast_sync

fix_compile_errors

fix_connectWithMaster_message

fix_delete_doesnt_exist_write_batch

fix_fast_sync_cluster

fix_fork_bg_save_tests

fix_long_name_zrangestore_crash

fix_lua_keys

fix_mac_warnings

fix_macos_compile

fix_optional_flash_build

fix_pbuild_ubuntu18.04

fix_prefetch_crash

fix_propagate_in_transaction_crash

fix_rdb_fd_leak

fix_rdb_hang

fix_snprint_uses

fix_systemd_service

fix_tls_tests

fix_ubuntu22arm

flash_expiration

flash_expire

flash_module_load_perf_improvement

flash_slot_to_key

gh-pages

github-ci

info

issue323_fix

jesse/feature/merge-redis-6.2.2

keydbpro_oss

macos_ci_warning_fix

main

main_pre_flash

mcs_lock

merge_internal

merge_main_with_oss_release_sep29_2022

merge_redis_sec_fixes

mm-psync

moar_perf

module_load_fix

msotheeswaran-sc-patch-1

namespaces

old-main

pkg

pkg-flash

pkg_config

pkg_update_tools

rand_fixes

redis_6_merge

redis_security_fixes

remove_np_sub

replication_filter

replping

systemd_build

systemd_rel

tenancity_evict

tls_fixes

tsxrtm

unstable

update_alpine_docker

update_gem_ref

update_keydb.conf

update_pkg

upgrade_rocksdb

vendor_rocksdb

vivek_pr278

#116

#120

#121

#126

#140

#15

#16

#174

#176

#18

#191

#195

#195/merge

#196

#196/merge

#197

#198

#199

#200

#201

#217

#217/merge

#223

#23

#241

#241/merge

#242

#243

#244

#245

#245/merge

#249

#249/merge

#250

#250/merge

#251

#252

#256

#259

#261

#263

#264

#266

#267

#268

#269

#270

#277

#278

#279

#280

#281

#282

#284

#287

#288

#290

#291

#292

#293

#294

#296

#298

#301

#302

#306

#311

#313

#315

#318

#320

#321

#322

#327

#328

#329

#331

#334

#338

#339

#340

#341

#342

#343

#344

#345

#346

#348

#354

#356

#357

#368

#369

#37

#371

#372

#373

#374

#375

#376

#377

#386

#391

#404

#407

#408

#417

#418

#421

#421/merge

#426

#429

#431

#433

#437

#437/merge

#438

#439

#439/merge

#441

#441/merge

#443

#46

#466

#48

#483

#491

#498

#50

#508

#518

#519

#520

#521

#522

#523

#524

#528

#529

#529/merge

#535

#536

#538

#540

#547

#548

#549

#550

#555

#557

#558

#560

#564

#570

#575

#577

#577/merge

#578

#579

#589

#591

#592

#6

#603

#603/merge

#604

#606

#609

#618

#620

#621

#622

#629

#637

#638

#639

#641

#644

#65

#650

#653

#654

#662

#664

#666

#667

#668

#682

#686

#687

#689

#696

#698

#702

#704

#706

#71

#712

#718

#720

#722

#727

#730

#737

#738

#741

#741/merge

#746

#753

#759

#759/merge

#762

#780

#781

#789

#789/merge

#790

#790/merge

#801

#803

#804

#806

#806/merge

#807

#807/merge

#823

#823/merge

#837

#837/merge

#840

#840/merge

#86

#863

#863/merge

#884

#884/merge

#896

#896/merge

#897

#898

#898/merge

#9

#90

#906

#906/merge

#908

#908/merge

#911

#911/merge

#915

#915/merge

#918

#918/merge

#921

#922

#925

#925/merge

#926

#926/merge

#93

#976

6.0.8-rc1

v0.9.2

v0.9.2-r2

v0.9.3

v0.9.4

v0.9.4-r2

v0.9.5

v0.9.6

v5.0.0

v5.0.1

v5.0.2

v5.1.0

v5.1.1

v5.2.0

v5.3.0

v5.3.1

v5.3.2

v5.3.3

v6.0.13

v6.0.16

v6.0.18

v6.2.0

v6.2.1

v6.2.2

v6.3.0

v6.3.1

v6.3.2

v6.3.3

v6.3.4

Mono Color

• 95b4f899c5 Merge branch 'redis_6_merge' of https://github.com/JohnSully/KeyDB into redis_6_merge John Sully 2020-03-30 00:52:43 -04:00
• d0be850e70 Merge branch 'redis_6_merge' of https://github.com/JohnSully/KeyDB into redis_6_merge John Sully 2020-03-30 00:52:43 -04:00
• 38d16ea581 Merge branch 'redis_6_merge' of https://github.com/JohnSully/KeyDB into redis_6_merge John Sully 2020-03-30 00:52:43 -04:00
• e9d1f9bc6c Merge branch 'redis_6_merge' of https://github.com/JohnSully/KeyDB into redis_6_merge John Sully 2020-03-30 00:52:43 -04:00
• 2946155313 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-30 00:52:12 -04:00
• 5306b94a63 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-30 00:52:12 -04:00
• 549b15d5a2 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-30 00:52:12 -04:00
• 4cf5373b9c Merge branch 'unstable' into redis_6_merge John Sully 2020-03-30 00:52:12 -04:00
• 07cb1f4581 Merge branch 'unstable' into RELEASE_5 RELEASE_5 John Sully 2020-03-30 00:51:55 -04:00
• 96cb83dac7 Allow active replicas to connect to each other when replica-serve-stale-data is set John Sully 2020-03-30 00:51:40 -04:00
• 12f76b2b95 Allow active replicas to connect to each other when replica-serve-stale-data is set John Sully 2020-03-30 00:51:40 -04:00
• 754138a94c Allow active replicas to connect to each other when replica-serve-stale-data is set John Sully 2020-03-30 00:51:40 -04:00
• f2ca2aa1f7 Allow active replicas to connect to each other when replica-serve-stale-data is set John Sully 2020-03-30 00:51:40 -04:00
• 2d1a2896f8 add check for not switching between optin optout mode directly hwware 2020-03-29 23:20:54 -04:00
• 86c76cad74 add check for not switching between optin optout mode directly hwware 2020-03-29 23:20:54 -04:00
• a5533e0ad8 add check for not providing both optin optout flag hwware 2020-03-29 23:06:50 -04:00
• 1ef44f8243 add check for not providing both optin optout flag hwware 2020-03-29 23:06:50 -04:00
• 5751ba1f2c PERSIST should notify a keyspace event Guy Benoish 2020-03-29 17:50:42 +03:00
• 3f0afab301 PERSIST should notify a keyspace event Guy Benoish 2020-03-29 17:50:42 +03:00
• 2fb4ea5473 Merge pull request #7033 from OMG-By/unstable Salvatore Sanfilippo 2020-03-29 16:17:52 +02:00
• aca7f36b57 Merge pull request #7033 from OMG-By/unstable Salvatore Sanfilippo 2020-03-29 16:17:52 +02:00
• 65710c2bef Don't send build log to stderr John Sully 2020-03-28 23:36:57 -04:00
• 883de95712 Don't send build log to stderr John Sully 2020-03-28 23:36:57 -04:00
• b28c7298ce Don't send build log to stderr John Sully 2020-03-28 23:36:57 -04:00
• b20bf10fda Don't send build log to stderr John Sully 2020-03-28 23:36:57 -04:00
• 5120922a86 fix: dict.c->dictResize()->minimal type OMG-By 2020-03-29 00:04:59 +08:00
• 6d2f1188ac fix: dict.c->dictResize()->minimal type OMG-By 2020-03-29 00:04:59 +08:00
• 9c4afeecb2 Merge pull request #7032 from soloestoy/psync2-meaningful-offset-bugfix Salvatore Sanfilippo 2020-03-28 14:52:11 +01:00
• e8afadd52c Merge pull request #7032 from soloestoy/psync2-meaningful-offset-bugfix Salvatore Sanfilippo 2020-03-28 14:52:11 +01:00
• 9a1be653ad PSYNC2: reset backlog_idx and master_repl_offset correctly zhaozhao.zz 2020-03-28 20:59:01 +08:00
• 36ee294e83 PSYNC2: reset backlog_idx and master_repl_offset correctly zhaozhao.zz 2020-03-28 20:59:01 +08:00
• 208c15bc16 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-27 14:50:37 -04:00
• 6225a65911 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-27 14:50:37 -04:00
• f8f752f2ab Merge branch 'unstable' into redis_6_merge John Sully 2020-03-27 14:50:37 -04:00
• 623c617042 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-27 14:50:37 -04:00
• fa6870a268 Merge branch 'unstable' into RELEASE_5 v5.3.3 John Sully 2020-03-27 14:36:35 -04:00
• 24cf761bf7 Raspberry Pi fixes (compile and replication) John Sully 2020-03-27 12:46:25 -04:00
• 4af17a23d8 Raspberry Pi fixes (compile and replication) John Sully 2020-03-27 12:46:25 -04:00
• 6283ca8a2c Raspberry Pi fixes (compile and replication) John Sully 2020-03-27 12:46:25 -04:00
• c3d3c82f3a Raspberry Pi fixes (compile and replication) John Sully 2020-03-27 12:46:25 -04:00
• aa3efaa1d2 timeout.c created: move client timeouts code there. antirez 2020-03-27 16:34:45 +01:00
• dd7e61d77f timeout.c created: move client timeouts code there. antirez 2020-03-27 16:34:45 +01:00
• ab10e0f2fb Precise timeouts: cleaup the table on unblock. antirez 2020-03-27 11:13:38 +01:00
• 0e22cb2680 Precise timeouts: cleaup the table on unblock. antirez 2020-03-27 11:13:38 +01:00
• 2ee65aff6b Precise timeouts: fix comments after functional change. antirez 2020-03-26 16:05:20 +01:00
• 13e4c2a9b1 Precise timeouts: fix comments after functional change. antirez 2020-03-26 16:05:20 +01:00
• 0264a78063 Precise timeouts: use only radix tree for timeouts. antirez 2020-03-26 16:02:26 +01:00
• aa9d92d94a Precise timeouts: use only radix tree for timeouts. antirez 2020-03-26 16:02:26 +01:00
• c54576c631 Precise timeouts: fast exit for clientsHandleShortTimeout(). antirez 2020-03-26 15:52:16 +01:00
• 077f965426 Precise timeouts: fast exit for clientsHandleShortTimeout(). antirez 2020-03-26 15:52:16 +01:00
• 36cba9bb8e Precise timeouts: fix bugs in initial implementation. antirez 2020-03-26 14:37:00 +01:00
• 8d11e0df7a Precise timeouts: fix bugs in initial implementation. antirez 2020-03-26 14:37:00 +01:00
• f232cb6670 Precise timeouts: working initial implementation. antirez 2020-03-26 13:28:39 +01:00
• 324a8c91d0 Precise timeouts: working initial implementation. antirez 2020-03-26 13:28:39 +01:00
• 86bd36d93a Precise timeouts: refactor unblocking on timeout. antirez 2020-03-26 11:33:18 +01:00
• 8d116cc8a2 Precise timeouts: refactor unblocking on timeout. antirez 2020-03-26 11:33:18 +01:00
• 94901f61b8 PSYNC2: fix backlog_idx when adjusting for meaningful offset antirez 2020-03-27 16:19:56 +01:00
• 97f1c808ce PSYNC2: fix backlog_idx when adjusting for meaningful offset antirez 2020-03-27 16:19:56 +01:00
• f534b5b3a2 OS X Build break fix John Sully 2020-03-26 15:20:55 -04:00
• a6448f7abe OS X Build break fix John Sully 2020-03-26 15:20:55 -04:00
• c0f10ae230 OS X Build break fix John Sully 2020-03-26 15:20:55 -04:00
• 8becc84c61 OS X Build break fix John Sully 2020-03-26 15:20:55 -04:00
• d2ab029447 OS X Build break fix John Sully 2020-03-26 15:20:55 -04:00
• 53a7041535 XREAD and XREADGROUP should not be allowed from scripts when BLOCK option is being used Valentino Geron 2020-03-26 11:49:21 +02:00
• 9a1843ef2d XREAD and XREADGROUP should not be allowed from scripts when BLOCK option is being used Valentino Geron 2020-03-26 11:49:21 +02:00
• 81c1e22b8d XACK should be executed in a "all or nothing" fashion. Valentino Geron 2020-03-25 21:54:14 +02:00
• 1547d72cf3 XACK should be executed in a "all or nothing" fashion. Valentino Geron 2020-03-25 21:54:14 +02:00
• 307ff72522 Merge pull request #6644 from oranagra/stream_aofrw Salvatore Sanfilippo 2020-03-26 11:12:44 +01:00
• 2ea7f0ecad Merge pull request #6644 from oranagra/stream_aofrw Salvatore Sanfilippo 2020-03-26 11:12:44 +01:00
• 27da034819 bump version John Sully 2020-03-26 01:19:21 -04:00
• 523708e150 bump version John Sully 2020-03-26 01:18:21 -04:00
• 5e2531251e bump version John Sully 2020-03-26 01:18:21 -04:00
• 366e00df79 bump version John Sully 2020-03-26 01:18:21 -04:00
• 9461513066 bump version John Sully 2020-03-26 01:18:21 -04:00
• fbf097afa5 Merge branch 'keydbpro' into PRO_RELEASE_6 John Sully 2020-03-26 01:17:56 -04:00
• c0d73c69ee Merge branch 'keydbpro' into PRO_RELEASE_6 John Sully 2020-03-26 01:17:56 -04:00
• 6742a6a70c Merge branch 'keydbpro' into PRO_RELEASE_6 John Sully 2020-03-26 01:17:56 -04:00
• 0f72eca2a0 Merge branch 'keydbpro' into PRO_RELEASE_6 John Sully 2020-03-26 01:17:56 -04:00
• 1bb4b72208 merge John Sully 2020-03-26 01:16:36 -04:00
• 4658af1c8f merge John Sully 2020-03-26 01:16:36 -04:00
• bdcdd1396b merge John Sully 2020-03-26 01:16:36 -04:00
• 138ce49a96 merge John Sully 2020-03-26 01:16:36 -04:00
• b22d9cc27d Fix merge issues John Sully 2020-03-25 22:26:27 -04:00
• a82e819618 Fix merge issues John Sully 2020-03-25 22:26:27 -04:00
• f4caa84987 Fix merge issues John Sully 2020-03-25 22:26:27 -04:00
• 8011cc3c6d Fix merge issues John Sully 2020-03-25 22:26:27 -04:00
• 908cf5042e Merge branch 'unstable' into redis_6_merge John Sully 2020-03-25 22:12:22 -04:00
• 1c2ae22fae Merge branch 'unstable' into redis_6_merge John Sully 2020-03-25 22:12:22 -04:00
• 9c4b66b9a4 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-25 22:12:22 -04:00
• aaa751acb8 Merge branch 'unstable' into redis_6_merge John Sully 2020-03-25 22:12:22 -04:00
• 6ec1641294 Fix issue #143 John Sully 2020-03-25 21:55:31 -04:00
• fa2c741aba Fix issue #143 John Sully 2020-03-25 21:55:31 -04:00
• 71fe6f7ba9 Fix issue #143 John Sully 2020-03-25 21:55:31 -04:00
• 356ed25c62 Fix issue #143 John Sully 2020-03-25 21:55:31 -04:00
• 7b79ec360b Give a better error when handling std::terminate John Sully 2020-03-25 16:27:24 -04:00
• 37c7675d3e Give a better error when handling std::terminate John Sully 2020-03-25 16:27:24 -04:00
• b443553a3d Give a better error when handling std::terminate John Sully 2020-03-25 16:27:24 -04:00
• 5e96404ad8 Give a better error when handling std::terminate John Sully 2020-03-25 16:27:24 -04:00
• 0cd0ecf62a Fix breaks from merge John Sully 2020-03-25 16:22:32 -04:00
• 0af4bd220e Fix breaks from merge John Sully 2020-03-25 16:22:32 -04:00