Merge pull request #8420 from heyitsanthony/corrupt-alarm

corruption alarm
etcd-io · Aug 22, 2017 · 5c975fd · 5c975fd
2 parents 65c0540 + 603f84b
commit 5c975fd
Show file tree

Hide file tree

Showing 30 changed files with 1,293 additions and 670 deletions.
diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json
@@ -1163,7 +1163,8 @@
       "default": "NONE",
       "enum": [
         "NONE",
-        "NOSPACE"
+        "NOSPACE",
+        "CORRUPT"
       ]
     },
     "etcdserverpbAuthDisableRequest": {

diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -26,15 +26,6 @@
 			}
 		]
 	},
-	{
-		"project": "github.com/cockroachdb/cmux",
-		"licenses": [
-			{
-				"type": "Apache License 2.0",
-				"confidence": 1
-			}
-		]
-	},
 	{
 		"project": "github.com/coreos/bbolt",
 		"licenses": [
@@ -264,6 +255,15 @@
 			}
 		]
 	},
+	{
+		"project": "github.com/soheilhy/cmux",
+		"licenses": [
+			{
+				"type": "Apache License 2.0",
+				"confidence": 1
+			}
+		]
+	},
 	{
 		"project": "github.com/spf13/cobra",
 		"licenses": [

diff --git a/cmd/vendor/github.com/cockroachdb/cmux/buffer.go b/cmd/vendor/github.com/cockroachdb/cmux/buffer.go
diff --git a/cmd/vendor/github.com/cockroachdb/cmux/matchers.go b/cmd/vendor/github.com/cockroachdb/cmux/matchers.go
diff --git a/...endor/github.com/cockroachdb/cmux/LICENSE → cmd/vendor/github.com/soheilhy/cmux/LICENSE b/...endor/github.com/cockroachdb/cmux/LICENSE → cmd/vendor/github.com/soheilhy/cmux/LICENSE
diff --git a/cmd/vendor/github.com/soheilhy/cmux/buffer.go b/cmd/vendor/github.com/soheilhy/cmux/buffer.go