Merge changes for #93, #171 (regions).

oasis-tcs · May 31, 2018 · 3756f0b · 3756f0b
1 parent 51b527f
commit 3756f0b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...if-v2.0-issue-93-region-improvements.docx → ....0-issues-93-171-region-improvements.docx b/...if-v2.0-issue-93-region-improvements.docx → ....0-issues-93-171-region-improvements.docx
diff --git a/Documents/ProvisionalDrafts/sarif-v2.0-wd02-provisional.docx b/Documents/ProvisionalDrafts/sarif-v2.0-wd02-provisional.docx
diff --git a/Documents/Schema changes between SARIF v1 and v2.md b/Documents/Schema changes between SARIF v1 and v2.md
@@ -750,8 +750,6 @@ These overrides are noted on the earlier change.
 
     - Change the `uri` property from `"format": "uri"` to `"format": "uri-reference"`.
 
-## Changes to review at TC #18
-
 - [Issue #93](https://github.com/oasis-tcs/sarif-spec/issues/93): "Problems with regions"
 
     In the `region` object:
@@ -763,6 +761,8 @@ These overrides are noted on the earlier change.
     - Add a `byteOffset` property of type `integer`, optional.
     - Add a `byteLength` property of type `integer`, optional.
 
+## Changes to review at TC #18
+
 - [Issue #149](https://github.com/oasis-tcs/sarif-spec/issues/149): "Support nested graphs"
 
     In the `node` object:

diff --git a/EditorsReports/Editor's report 2018-06-06.md b/EditorsReports/Editor's report 2018-06-06.md
@@ -6,9 +6,13 @@ Presented at TC Meeting #19, June 6th, 2018
 
 1. After being approved without amendment at the last TC meeting (#18), the following spec changes were merged into the provisional draft:
 
+    1. [Issue #93](https://github.com/oasis-tcs/sarif-spec/issues/93): "Problems with regions"
+
     1. [Issue #160](https://github.com/oasis-tcs/sarif-spec/issues/160): "Roles for edited files" (revision: `"generatedFile"` &rarr; `"uncontrolledFile"`).
 
-    1. [Issue #176](https://github.com/oasis-tcs/sarif-spec/issues/76): "fileLocation uri property should be a URI reference"
+    1. [Issue #171](https://github.com/oasis-tcs/sarif-spec/issues/171): "Inconsistent definition of `endColumn`"
+
+    1. [Issue #176](https://github.com/oasis-tcs/sarif-spec/issues/176): "fileLocation uri property should be a URI reference"
 
     1. [Issue #181](https://github.com/oasis-tcs/sarif-spec/issues/181): "Property bag property names should be hierarchical"