Merge branch 'stable-2.8'

* stable-2.8:
  Update 2.8.2 release notes with recently merged changes.
  Change dialog title from Error to Warning on intraline diff timeout
  Another attempt to fix submit rule evaluation for non blocking labels
  Fix: Label update operation is executed as insert
  RFC: Work around null commit when updating submodules

Change-Id: Icc1ce1698add8321a86af42ed864b02d9ef58040
This commit is contained in:
Shawn Pearce
2014-03-06 12:07:38 -08:00
14 changed files with 101 additions and 23 deletions

View File

@@ -26,4 +26,5 @@ public class LabelInfo {
public Map<String, String> values;
public Short value;
public Boolean optional;
public Boolean blocking;
}