natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Brandon Williams 2021-09-03 13:48:32 -05:00
parent d6e1c41c48 615372f908
commit ecf186f859
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -13,6 +13,8 @@ Merged from 3.0:
* Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
* Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
* Remove mutation data from error log message (CASSANDRA-16817)
Merged from 2.2:
* Add python2 location to RPMs (CASSANDRA-16822)
3.11.11

5
redhat/cassandra.spec
View File

@ -87,6 +87,9 @@ mkdir -p %{buildroot}/var/lib/%{username}/hints
mkdir -p %{buildroot}/var/run/%{username}
mkdir -p %{buildroot}/var/log/%{username}
( cd pylib && %{__python} setup.py install --no-compile --root %{buildroot}; )
# cqlsh before Cassandra version 4.0 still requires python2
mkdir -p %{buildroot}/usr/lib/python2.7/site-packages
cp -r %{buildroot}%{python_sitelib}/cqlshlib %{buildroot}/usr/lib/python2.7/site-packages/
# patches for data and log paths
patch -p1 < debian/patches/001cassandra_yaml_dirs.dpatch
@ -162,6 +165,8 @@ exit 0
%attr(755,%{username},%{username}) /var/run/%{username}*
%{python_sitelib}/cqlshlib/
%{python_sitelib}/cassandra_pylib*.egg-info
# cqlsh before Cassandra version 4.0 still requires python2
/usr/lib/python2.7/site-packages/cqlshlib
%post
alternatives --install /%{_sysconfdir}/%{username}/conf %{username} /%{_sysconfdir}/%{username}/default.conf/ 0