Merge branch 'http-verbs' into cockroach

Manually merged conflicts:

  rust/migrations/2018-05-12-001226_init/up.sql
  rust/src/api_server.rs
  rust/src/database_schema.rs

1 files changed, 60 insertions, 0 deletions

diff --git a/python/tests/codegen_tests/test_default_api.py b/python/tests/codegen_tests/test_default_api.py
index e3008898..ec36887b 100644
--- a/python/tests/codegen_tests/test_default_api.py
+++ b/python/tests/codegen_tests/test_default_api.py
@@ -101,6 +101,36 @@ class TestDefaultApi(unittest.TestCase):
         """
         pass
 
+    def test_delete_container(self):
+        """Test case for delete_container
+
+        """
+        pass
+
+    def test_delete_creator(self):
+        """Test case for delete_creator
+
+        """
+        pass
+
+    def test_delete_file(self):
+        """Test case for delete_file
+
+        """
+        pass
+
+    def test_delete_release(self):
+        """Test case for delete_release
+
+        """
+        pass
+
+    def test_delete_work(self):
+        """Test case for delete_work
+
+        """
+        pass
+
     def test_get_changelog(self):
         """Test case for get_changelog
 
@@ -239,6 +269,36 @@ class TestDefaultApi(unittest.TestCase):
         """
         pass
 
+    def test_update_container(self):
+        """Test case for update_container
+
+        """
+        pass
+
+    def test_update_creator(self):
+        """Test case for update_creator
+
+        """
+        pass
+
+    def test_update_file(self):
+        """Test case for update_file
+
+        """
+        pass
+
+    def test_update_release(self):
+        """Test case for update_release
+
+        """
+        pass
+
+    def test_update_work(self):
+        """Test case for update_work
+
+        """
+        pass
+
 
 if __name__ == '__main__':
     unittest.main()