Merge branch 'master-readonly-records' into foo
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 11 Sep 2011 23:34:34 +0000 (09:34 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 11 Sep 2011 23:34:34 +0000 (09:34 +1000)
commit0fedef0ffba4178126eee9544c5e2db52f5db893
tree067ecd826ae792214d54ee2fa344c0b340f38a90
parent3ce1d3d6c8b8fd3097b8efd2c75797ed7682a562
parent1a766382d7d774aa3444e07401575e51d3704dba
Merge branch 'master-readonly-records' into foo

Conflicts:

Makefile.in
tools/ctdb.c
Makefile.in
client/ctdb_client.c
include/ctdb_client.h
include/ctdb_private.h
server/ctdb_ltdb_server.c
server/ctdb_recoverd.c
tools/ctdb.c
tools/ctdb_vacuum.c