Unverified Commit 2dba1e39 authored by Oran Agra's avatar Oran Agra Committed by GitHub
Browse files

Merge 6.2 RC3

parents ec2d1807 95338f9c
This diff is collapsed.
...@@ -749,7 +749,7 @@ sds getAbsolutePath(char *filename) { ...@@ -749,7 +749,7 @@ sds getAbsolutePath(char *filename) {
* Gets the proper timezone in a more portable fashion * Gets the proper timezone in a more portable fashion
* i.e timezone variables are linux specific. * i.e timezone variables are linux specific.
*/ */
unsigned long getTimeZone(void) { long getTimeZone(void) {
#if defined(__linux__) || defined(__sun) #if defined(__linux__) || defined(__sun)
return timezone; return timezone;
#else #else
...@@ -758,7 +758,7 @@ unsigned long getTimeZone(void) { ...@@ -758,7 +758,7 @@ unsigned long getTimeZone(void) {
gettimeofday(&tv, &tz); gettimeofday(&tv, &tz);
return tz.tz_minuteswest * 60UL; return tz.tz_minuteswest * 60L;
#endif #endif
} }
......
This diff is collapsed.
#define REDIS_VERSION "6.1.241" #define REDIS_VERSION "6.1.242"
#define REDIS_VERSION_NUM 0x000601f1 #define REDIS_VERSION_NUM 0x000601f2
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment