Merge dev to default.

Ref T24.

.hgignore

@@ -1,6 +1,5 @@
 syntax: glob
 *~
-*.capnp.go
 *.log
 *.test
 *.swp

LICENSE

@@ -619,7 +619,7 @@ copy of the Program in return for a fee.
                      END OF TERMS AND CONDITIONS
 
     GoshawkDB Server
-    Copyright (C) 2015 Matthew Sackman <matthew@goshawkdb.io>
+    Copyright (C) 2015-2016 Matthew Sackman <matthew@goshawkdb.io>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published by

capnp/Makefile

@@ -0,0 +1,14 @@
+CAPNP := $(patsubst %.capnp,%.capnp.go,$(filter-out go.capnp,$(wildcard *.capnp)))
+CAPNPGO := $(wildcard *.capnp.go)
+
+all: capnp
+
+capnp: $(CAPNP)
+
+clean:
+	rm -f $(CAPNPGO)
+
+%.capnp.go: %.capnp
+	capnp compile -o go $<
+
+.PHONY: all capnp clean

capnp/acceptor.capnp

@@ -0,0 +1,29 @@
+using Go = import "../../common/capnp/go.capnp";
+
+$Go.package("capnp");
+$Go.import("goshawkdb.io/server/capnp");
+
+@0xefa5a1e88b6da9e3;
+
+using Ballot  = import "ballot.capnp";
+using Txn     = import "transaction.capnp";
+using Outcome = import "outcome.capnp";
+
+struct AcceptorState {
+  txn       @0: Txn.Txn;
+  outcome   @1: Outcome.Outcome;
+  sendToAll @2: Bool;
+  instances @3: List(InstancesForVar);
+}
+
+struct InstancesForVar {
+  varId     @0: Data;
+  instances @1: List(AcceptedInstance);
+  result    @2: Ballot.Ballot;
+}
+
+struct AcceptedInstance {
+  rmId        @0: UInt32;
+  roundNumber @1: UInt64;
+  ballot      @2: Ballot.Ballot;
+}