summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-06-10 17:02:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:14 -0500
commitde565785f5e1f097bd75f57331425c4185185f80 (patch)
treeaf24bb44388f9ffa2077435cc3fea134557c186b /source3/include/includes.h
parentb05c7b97830f6029c264fc44831c2f5eae4f0c83 (diff)
downloadsamba-de565785f5e1f097bd75f57331425c4185185f80.tar.gz
samba-de565785f5e1f097bd75f57331425c4185185f80.tar.bz2
samba-de565785f5e1f097bd75f57331425c4185185f80.zip
r23410: Merge the core of the cluster code.
I'm 100% certain I've forgotten to merge something, but the main code should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and messages_ctdbd.c. There should be no changes to the non-cluster case, it does survive make test on my laptop. It survives some very basic tests with ctdbd enables, I did not do the full test suite for clusters yet. Phew... Volker (This used to be commit 15553d6327a3aecdd2b0b94a3656d04bf4106323)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9c7b3d1c1f..20a693d64b 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -702,6 +702,8 @@ typedef int BOOL;
#include "rpc_client.h"
#include "event.h"
#include "dbwrap.h"
+#include "packet.h"
+#include "ctdbd_conn.h"
/*
* Type for wide character dirent structure.