Merge branch 'develop' into feature/116933673_jrubin_update_status_me…

…ssage
zvelo · Apr 8, 2016 · c6054ef · c6054ef
2 parents b5ebd82 + c14bee1
commit c6054ef
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 38 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-07  Bob Uhl <buhl@zvelo.com>
+
+  * Start feature "Add bulk categorizations to zvelo.io/msg"
+  https://www.pivotaltracker.com/story/show/117147861
+  https://github.com/zvelo/msg/pull/5
+
 2016-04-04  Joshua Rubin <jrubin@zvelo.com>
 
   * Start feature "Update Status message"

diff --git a/categorization.proto b/categorization.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package msg;
+
+import "dataset.proto";
+
+message Categorization {
+  string url = 1;
+  DataSet dataset = 2;
+}
+
+message Categorizations {
+  repeated Categorization categorizations = 1;
+}
diff --git a/go-msg/categorization.pb.go b/go-msg/categorization.pb.go
diff --git a/go-msg/dataset.pb.go b/go-msg/dataset.pb.go
diff --git a/go-msg/query_result.pb.go b/go-msg/query_result.pb.go
diff --git a/go-msg/status.pb.go b/go-msg/status.pb.go
diff --git a/go-msg/zvelo-api.pb.go b/go-msg/zvelo-api.pb.go