From acd20460c9fe4aa35f70f9eb26b08574e2ba0390 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Wed, 4 Apr 2018 13:42:59 +0200
Subject: [PATCH] Updates EOS to latest version
---
.../cc7/etc/yum/pluginconf.d/versionlock.list | 28 +++++++++----------
xroot_plugins/XrdSsiCtaServiceProvider.cpp | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
index 8314a741e8..cb07544d26 100644
--- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
+++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
@@ -1,17 +1,17 @@
-0:eos-archive-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-cleanup-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-client-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-debuginfo-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-fuse-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-fuse-core-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-fuse-sysv-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-fusex-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-fusex-core-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-fusex-selinux-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-server-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-srm-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-test-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
-0:eos-testkeytab-4.2.18-20180322093049git3ffb8cb.el7.cern.x86_64
+0:eos-archive-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-cleanup-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-client-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-debuginfo-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-fuse-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-fuse-core-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-fuse-sysv-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-fusex-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-fusex-core-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-fusex-selinux-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-server-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-srm-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-test-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
+0:eos-testkeytab-4.2.18-20180404111801git6255bbf.el7.cern.x86_64
1:python2-xrootd-4.8.2-0.rc2.el7.*
1:python3-xrootd-4.8.2-0.rc2.el7.*
1:xrootd-4.8.2-0.rc2.el7.*
diff --git a/xroot_plugins/XrdSsiCtaServiceProvider.cpp b/xroot_plugins/XrdSsiCtaServiceProvider.cpp
index 8fdc5683ff..4cbad76271 100644
--- a/xroot_plugins/XrdSsiCtaServiceProvider.cpp
+++ b/xroot_plugins/XrdSsiCtaServiceProvider.cpp
@@ -94,7 +94,7 @@ bool XrdSsiCtaServiceProvider::Init(XrdSsiLogger *logP, XrdSsiCluster *clsP, con
const rdbms::Login catalogueLogin = rdbms::Login::parseFile("/etc/cta/cta-catalogue.conf");
auto catalogue_numberofconnections = config.getOptionValueInt("cta.catalogue.numberofconnections");
if(!catalogue_numberofconnections.first) {
- throw exception::Exception("cta.catalogue.numberofconnections is not set in configuration filei " + cfgFn);
+ throw exception::Exception("cta.catalogue.numberofconnections is not set in configuration file " + cfgFn);
}
const uint64_t nbArchiveFileListingConns = 2;
--
GitLab