Merge branch 'keydbpro' into PRO_RELEASE_6
Former-commit-id: 6b6a1c711dbb7786e30be29e2d1930582037f7f9
This commit is contained in:
commit
a9b56bfb2f
12
.github/workflows/ci.yml
vendored
12
.github/workflows/ci.yml
vendored
@ -7,7 +7,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
with:
|
||||
with:
|
||||
submodules: true
|
||||
- name: make
|
||||
run: |
|
||||
@ -22,18 +22,10 @@ jobs:
|
||||
runs-on: ubuntu-16.04
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
with:
|
||||
with:
|
||||
submodules: true
|
||||
- name: make
|
||||
run: |
|
||||
sudo apt-get install uuid-dev libcurl4-openssl-dev
|
||||
make
|
||||
|
||||
build-macos-latest:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
with:
|
||||
submodules: true
|
||||
- name: make
|
||||
run: make
|
||||
|
@ -5129,8 +5129,10 @@ void redisAsciiArt(void) {
|
||||
|
||||
if (cserver.license_key == nullptr)
|
||||
{
|
||||
#ifndef NO_LICENSE_CHECK
|
||||
serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!");
|
||||
serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout);
|
||||
#endif
|
||||
}
|
||||
zfree(buf);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user