]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37924 from yuvalif/allow_packages_in_lua
authorYuval Lifshitz <yuvalif@yahoo.com>
Thu, 17 Dec 2020 17:53:00 +0000 (19:53 +0200)
committerGitHub <noreply@github.com>
Thu, 17 Dec 2020 17:53:00 +0000 (19:53 +0200)
rgw/lua: support packages via luarocks

1  2 
CMakeLists.txt
ceph.spec.in
debian/control
src/common/options.cc
src/include/config-h.in.cmake
src/rgw/CMakeLists.txt
src/rgw/rgw_lua_utils.h
src/rgw/rgw_process.cc
src/rgw/rgw_sal.h
src/rgw/rgw_sal_rados.h
src/vstart.sh

diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
index a2abffcc661f0465e8e6836f6c68d60e7adc7909,370d7420ff6aa9a58c3ba961f9eb2b471704e36b..8cd37afdfe94a4a83470e0151edc7d8c76cda541
@@@ -64,8 -60,10 +64,9 @@@ Build-Depends: automake
                 libudev-dev,
                 libnl-genl-3-dev,
                 libxml2-dev,
 -# Crimson      libyaml-cpp-dev,
                 librabbitmq-dev,
                 librdkafka-dev,
+                luarocks,
  # Make-Check   libxmlsec1,
  # Make-Check   libxmlsec1-nss,
  # Make-Check   libxmlsec1-openssl,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/vstart.sh
Simple merge