Merge pull request #893 from opencontainers/bump-version

vbatts · web-flow · commit 337efca02914 · 2017-07-19T15:59:12.000-04:00
Release v1.0.0
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,24 @@
 OpenContainers Specifications
 
+Changes with v1.0.0:
+
+	Breaking changes:
+
+	* config: Shift disableOOMKiller from linux.resources to
+	  linux.resources.memory (#896)
+
+	Decreased restrictions:
+
+	* runtime: Make the state JSON's pid optional on non-Linux platforms
+	  (#897)
+
+	Minor fixes and documentation:
+
+	* schema/defs-linux: Require Syscall.action (#885)
+	* specs-go/config: Fix 'omiempty' -> 'omitempty' typo for
+	  LinuxSeccompArg.ValueTwo (#884)
+	* ROAMAP: remove the pre-v1.0.0 roadmap (#890)
+
 Changes with v1.0.0-rc6:
 
 	Breaking changes:
diff --git a/specs-go/version.go b/specs-go/version.go
@@ -11,7 +11,7 @@ const (
 	VersionPatch = 0
 
 	// VersionDev indicates development branch. Releases will be empty string.
-	VersionDev = "-rc6-dev"
+	VersionDev = "-dev"
 )
 
 // Version is the specification version that the package types support.

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ const (`
`11`	`11`	`VersionPatch = 0`
`12`	`12`
`13`	`13`	`// VersionDev indicates development branch. Releases will be empty string.`
`14`		`- VersionDev = "-rc6-dev"`
	`14`	`+ VersionDev = "-dev"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// Version is the specification version that the package types support.`