tree 4330debd72cd90373f5970953e94a90f679dbbf9
parent 8e9c4c9cc3ea0bc2296c49fd53491a162d616384
parent 2bb0f3a4da70458ca1f68f44b32d0a7a0d649168
author David Pursehouse <david.pursehouse@sonymobile.com> 1424911725 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1424911835 +0900

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Fix NullPointerException when executing query with --comments option
  ChangeControl: Optimize creation by not re-reading changes

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java
	gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
	gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
	gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java

Change-Id: Id2098e90c2c19d36d86585b39249c1ca75590641