gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'keydbpro' into PRO_RELEASE_6

Browse Source 
Former-commit-id: 6b6a1c711dbb7786e30be29e2d1930582037f7f9
This commit is contained in:
John Sully 2020-04-22 01:06:24 -04:00
commit a9b56bfb2f
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View File

@ -29,11 +29,3 @@ jobs:
sudo apt-get install uuid-dev libcurl4-openssl-dev sudo apt-get install uuid-dev libcurl4-openssl-dev
make make
build-macos-latest:
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
with:
submodules: true
- name: make
run: make

2
src/server.cpp
View File

@ -5129,8 +5129,10 @@ void redisAsciiArt(void) {
if (cserver.license_key == nullptr) if (cserver.license_key == nullptr)
{ {
#ifndef NO_LICENSE_CHECK
serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!"); serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!");
serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout); serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout);
#endif
} }
zfree(buf); zfree(buf);
} }