summaryrefslogtreecommitdiffstats
path: root/ctdb/server
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2012-04-26 08:09:23 +1000
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2012-04-26 08:09:23 +1000
commitdb411aaada39593c80f92e46be31d3473bf4639f (patch)
treef68222404db2155cc6d8d3f861ac486cb8a509ae /ctdb/server
parent58e10b280d4a94a812bad07bbca049cddb2c1174 (diff)
parent195cf3c87e3c6c9f1784aa483110a64bc8760703 (diff)
downloadsamba-db411aaada39593c80f92e46be31d3473bf4639f.tar.gz
samba-db411aaada39593c80f92e46be31d3473bf4639f.tar.xz
samba-db411aaada39593c80f92e46be31d3473bf4639f.zip
Merge remote branch 'amitay/tevent-sync'
(This used to be ctdb commit 17ff3f240b0d72c72ed28d70fb9aeb3b20c80670)
Diffstat (limited to 'ctdb/server')
-rw-r--r--ctdb/server/ctdb_banning.c1
-rw-r--r--ctdb/server/ctdb_call.c1
-rw-r--r--ctdb/server/ctdb_control.c1
-rw-r--r--ctdb/server/ctdb_daemon.c1
-rw-r--r--ctdb/server/ctdb_freeze.c1
-rw-r--r--ctdb/server/ctdb_keepalive.c1
-rw-r--r--ctdb/server/ctdb_lockwait.c1
-rw-r--r--ctdb/server/ctdb_logging.c1
-rw-r--r--ctdb/server/ctdb_ltdb_server.c1
-rw-r--r--ctdb/server/ctdb_monitor.c1
-rw-r--r--ctdb/server/ctdb_persistent.c1
-rw-r--r--ctdb/server/ctdb_recover.c1
-rw-r--r--ctdb/server/ctdb_recoverd.c1
-rw-r--r--ctdb/server/ctdb_server.c1
-rw-r--r--ctdb/server/ctdb_statistics.c1
-rw-r--r--ctdb/server/ctdb_takeover.c1
-rw-r--r--ctdb/server/ctdb_traverse.c1
-rw-r--r--ctdb/server/ctdb_update_record.c1
-rw-r--r--ctdb/server/ctdb_uptime.c1
-rw-r--r--ctdb/server/ctdb_vacuum.c2
-rw-r--r--ctdb/server/ctdbd.c1
-rw-r--r--ctdb/server/eventscript.c1
22 files changed, 0 insertions, 23 deletions
diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c
index 56849072d7..4e6db31ee1 100644
--- a/ctdb/server/ctdb_banning.c
+++ b/ctdb/server/ctdb_banning.c
@@ -17,7 +17,6 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/time.h"
#include "system/network.h"
diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index cca7f01b6c..08b701c4fc 100644
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -21,7 +21,6 @@
protocol design and packet details
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index dee5818323..09210826fa 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -17,7 +17,6 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index a267b88e1b..5002629ef4 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -20,7 +20,6 @@
#include "includes.h"
#include "db_wrap.h"
#include "lib/tdb/include/tdb.h"
-#include "lib/tevent/tevent.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index 0f70fd3502..7233317667 100644
--- a/ctdb/server/ctdb_freeze.c
+++ b/ctdb/server/ctdb_freeze.c
@@ -17,7 +17,6 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/server/ctdb_keepalive.c b/ctdb/server/ctdb_keepalive.c
index b4899b746f..5c95eb0c9b 100644
--- a/ctdb/server/ctdb_keepalive.c
+++ b/ctdb/server/ctdb_keepalive.c
@@ -19,7 +19,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
diff --git a/ctdb/server/ctdb_lockwait.c b/ctdb/server/ctdb_lockwait.c
index 98606928b4..35f5902b00 100644
--- a/ctdb/server/ctdb_lockwait.c
+++ b/ctdb/server/ctdb_lockwait.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "system/wait.h"
#include "db_wrap.h"
diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index 98087aaebb..7133d064e6 100644
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "../include/ctdb_client.h"
#include "../include/ctdb_private.h"
#include "system/syslog.h"
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 34da0192bf..1d21c07a56 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 7258d3957a..bc21e5bb1d 100644
--- a/ctdb/server/ctdb_monitor.c
+++ b/ctdb/server/ctdb_monitor.c
@@ -19,7 +19,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c
index ba93e8bc05..91c336c7a4 100644
--- a/ctdb/server/ctdb_persistent.c
+++ b/ctdb/server/ctdb_persistent.c
@@ -19,7 +19,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "system/wait.h"
#include "db_wrap.h"
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 330daedb93..937a2b8445 100644
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -18,7 +18,6 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/time.h"
#include "system/network.h"
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index c079217868..359fe79749 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "system/time.h"
#include "system/network.h"
diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index 3aae28e33e..ec608cfa56 100644
--- a/ctdb/server/ctdb_server.c
+++ b/ctdb/server/ctdb_server.c
@@ -19,7 +19,6 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
-#include "lib/tevent/tevent.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/server/ctdb_statistics.c b/ctdb/server/ctdb_statistics.c
index 502d4df1f9..96aad78323 100644
--- a/ctdb/server/ctdb_statistics.c
+++ b/ctdb/server/ctdb_statistics.c
@@ -19,7 +19,6 @@
#include "includes.h"
#include <string.h>
-#include "lib/tevent/tevent.h"
#include "../include/ctdb_private.h"
static void ctdb_statistics_update(struct event_context *ev, struct timed_event *te,
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 43201a3832..c0acdcce91 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -19,7 +19,6 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c
index da5a548da5..d7399347ec 100644
--- a/ctdb/server/ctdb_traverse.c
+++ b/ctdb/server/ctdb_traverse.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "system/wait.h"
#include "db_wrap.h"
diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c
index 5845f1a7f2..92b304c08a 100644
--- a/ctdb/server/ctdb_update_record.c
+++ b/ctdb/server/ctdb_update_record.c
@@ -19,7 +19,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "db_wrap.h"
#include "lib/tdb/include/tdb.h"
#include "ctdb_private.h"
diff --git a/ctdb/server/ctdb_uptime.c b/ctdb/server/ctdb_uptime.c
index 6720e0da82..b45ea80dd1 100644
--- a/ctdb/server/ctdb_uptime.c
+++ b/ctdb/server/ctdb_uptime.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "../include/ctdb_private.h"
#include "system/syslog.h"
#include "system/time.h"
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index b492f9b899..c5b4d9dc1b 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
@@ -28,7 +27,6 @@
#include "../include/ctdb_private.h"
#include "db_wrap.h"
#include "lib/util/dlinklist.h"
-#include "lib/tevent/tevent.h"
#include "../include/ctdb_private.h"
#include "../common/rb_tree.h"
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 4205bd227b..eafef8d85a 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "popt.h"
#include "system/time.h"
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 146da9d1ec..50ff7c3ceb 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -24,7 +24,6 @@
#include "system/dir.h"
#include "system/locale.h"
#include "../include/ctdb_private.h"
-#include "lib/tevent/tevent.h"
#include "../common/rb_tree.h"
#include "lib/util/dlinklist.h"