tree 17d41863ff2f2cbe173dc15d1c7b1742763af3e3
parent af4d3ce96e220bf474a5f19ebed032058672428d
parent 7c1a56f51fd41b1cf776754c7b6bacb1418bc73a
author Sasa Zivkov <sasa.zivkov@sap.com> 1340004631 +0200
committer Sasa Zivkov <sasa.zivkov@sap.com> 1340004631 +0200

Merge tag 'v2.4.1'

gerrit 2.4.1

* tag 'v2.4.1':
  Gerrit 2.4.1 ReleaseNotes
  Make logging events discardable, prevent NPE in AsyncAppender thread.
  Display proper error if file diff fails because content is too large
  Make async logging buffer size configurable.
  Make sure the "Object too large..." error is printed to the client

Conflicts:
	gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java

Change-Id: Ifd6b7ba9d3b099576fab97d7d739beef7949d045
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>