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

Fix unmerged files

Browse Source
This commit is contained in:
John Sully 2022-05-18 01:36:48 +00:00
parent a265f815e2
commit d2d76c2ed1
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/deb/master_changelog
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
keydb (6:6.3.0-1distribution_placeholder) codename_placeholder; urgency=medium keydb (6:6.3.0-1distribution_placeholder) codename_placeholder; urgency=medium
* This release open sources KeyDB Enterprise features into the open source project along with PSYNC for active replication * This release open sources KeyDB Enterprise features into the open source project along with PSYNC for active replication
@ -14,7 +12,6 @@ keydb (6:6.3.0-1distribution_placeholder) codename_placeholder; urgency=medium
-- Ben Schermel <ben@eqalpha.com> Wed, 11 May 2022 20:00:37 +0000 -- Ben Schermel <ben@eqalpha.com> Wed, 11 May 2022 20:00:37 +0000
>>>>>>> public/main
keydb (6:6.2.2-1distribution_placeholder) codename_placeholder; urgency=medium keydb (6:6.2.2-1distribution_placeholder) codename_placeholder; urgency=medium
* Acquire lock in module.cpp to fix module test break * Acquire lock in module.cpp to fix module test break

4
pkg/rpm/keydb_build/keydb.spec
View File

@ -27,11 +27,7 @@ getent group keydb &> /dev/null || \
groupadd -r keydb &> /dev/null groupadd -r keydb &> /dev/null
getent passwd keydb &> /dev/null || \ getent passwd keydb &> /dev/null || \
useradd -r -g keydb -d /var/lib/keydb -s /sbin/nologin \ useradd -r -g keydb -d /var/lib/keydb -s /sbin/nologin \
<<<<<<< HEAD
-c 'KeyDB Enterprise Database Server' keydb &> /dev/null
=======
-c 'KeyDB Database Server' keydb &> /dev/null -c 'KeyDB Database Server' keydb &> /dev/null
>>>>>>> public/main
exit 0 exit 0
#postinstall scriptlet (using /bin/sh): #postinstall scriptlet (using /bin/sh):