tree e81f5b5f535a56434d4a72e3097d32a5a0ccbd89
parent 9f2398edd4e717c569378dbb45ac06aa76d90b76
parent 97d4da6586699f6a1d8bfc2d01017fe2fa07e9b7
author David Pursehouse <david.pursehouse@sonymobile.com> 1452234088 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1452674416 +0900

Merge branch 'stable-2.12'

* stable-2.12:
  Update cookbook submodule
  MergeValidationListener: Expose the caller in onPreMerge() method
  Correctly detect symlinked log directory on startup
  RebaseIfNecessary: Use submitter identity as the committer
  Fix schema migration (115) when updating from Gerrit < 2.11
  Hide avatar image when there are no avatars available
  Add back ListChangesOption.DRAFT_COMMENTS

Change-Id: Ibaf1264332fdc30db0f0f548121db728f78927ae