Skip to content

Commit 4ebdf9b

Browse files
committed
Merge branch 'incrementail_defrag_module' into DefragRedisModuleDictDict
2 parents 31148f6 + 467ddbb commit 4ebdf9b

File tree

7 files changed

+162
-130
lines changed

7 files changed

+162
-130
lines changed

src/ae.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
* for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
33
* it in form of a library for easy reuse.
44
*
5-
* Copyright (c) 2006-Present, Redis Ltd.
5+
* Copyright (c) 2009-Present, Redis Ltd.
6+
* All rights reserved.
7+
*
8+
* Copyright (c) 2024-present, Valkey contributors.
69
* All rights reserved.
710
*
811
* Licensed under your choice of the Redis Source Available License 2.0
912
* (RSALv2) or the Server Side Public License v1 (SSPLv1).
13+
*
14+
* Portions of this file are available under BSD3 terms; see REDISCONTRIBUTIONS for more information.
1015
*/
1116

1217
#include "ae.h"

src/db.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
* Copyright (c) 2009-Present, Redis Ltd.
33
* All rights reserved.
44
*
5+
* Copyright (c) 2024-present, Valkey contributors.
6+
* All rights reserved.
7+
*
58
* Licensed under your choice of the Redis Source Available License 2.0
69
* (RSALv2) or the Server Side Public License v1 (SSPLv1).
10+
*
11+
* Portions of this file are available under BSD3 terms; see REDISCONTRIBUTIONS for more information.
712
*/
813

914
#include "server.h"

0 commit comments

Comments
 (0)