Merge remote-tracking branch 'origin/master' into feature/jobs_plugin

# Conflicts:
#	plugins/websockets/plugin.go

1 files changed, 22 insertions, 0 deletions

diff --git a/proto/kv/v1beta/kv.proto b/proto/kv/v1beta/kv.proto
new file mode 100644
index 00000000..1e3b8177
--- /dev/null
+++ b/proto/kv/v1beta/kv.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package kv.v1beta;
+option go_package = "./;kvv1beta";
+
+message Request {
+    // could be an enum in the future
+    string storage = 1;
+    repeated Item items = 2;
+}
+
+message Item {
+    string key = 1;
+    bytes value = 2;
+    // RFC 3339
+    string timeout = 3;
+}
+
+// KV response for the KV RPC methods
+message Response {
+    repeated Item items = 1;
+}