Merge branch 'stable-2.5'

* stable-2.5:
  Fix order of top-level menus
  Ensure that ObjectOutputStream in H2CacheImpl is closed
  Flush persistent H2 cache if the existing entries are incompatible
  Fix plugin loading when running as hosted WAR or GWT DevMode.
  ChangeMessageAccess: Add index for byPathSet method.
  File indentation is sometimes wrong in Side-By-Side
  Move the Groups and Plugins menu items to the top level.
  Call inserter.flush() when creating code review notes
  Add ssh command "test-submit-rule"
  Split up canSubmit()
  Add submit records to query output.

Conflicts:
	Documentation/json.txt
	gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
	gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java

Change-Id: I6f9d44cfbd7060d65c8eb8a399d089a88f9bc697
This commit is contained in:
Shawn O. Pearce
2012-10-16 12:09:33 -07:00
5 changed files with 31 additions and 5 deletions

View File

@@ -69,6 +69,9 @@ neededBy:: List of changes that depend on this change in <<dependency,dependency
submitRecords:: The <<submitRecord,submitRecord attribute>> contains
information about whether this change has been or can be submitted.
submitRecords:: The <<submitRecord,submitRecord attribute>> contains
information about whether this change has been or can be submitted.
[[trackingid]]
trackingid
----------