Adding upstream version 2.1.7.upstream/2.1.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/daemons/controld/controld_globals.h b/daemons/controld/controld_globals.h
index eff1607..2ff8a57 100644
--- a/daemons/controld/controld_globals.h
+++ b/daemons/controld/controld_globals.h
@@ -45,9 +45,6 @@ typedef struct {
     //! Connection to the CIB
     cib_t *cib_conn;
 
-    //! CIB connection's client ID
-    const char *cib_client_id;
-
 
     // Scheduler
 
@@ -93,6 +90,9 @@ typedef struct {
     //! Max lifetime (in seconds) of a resource's shutdown lock to a node
     guint shutdown_lock_limit;
 
+    //! Node pending timeout
+    guint node_pending_timeout;
+
     //! Main event loop
     GMainLoop *mainloop;
 } controld_globals_t;