tag | 2f8759f3b8850f2331859ee69ed010f8c43ccf2b | |
---|---|---|
tagger | Dave Borowitz <dborowitz@google.com> | Fri Aug 16 12:23:12 2013 -0700 |
object | 560beb5079df6fa4d14fa2dbd68566ce429f8c5b |
gerrit 2.7-rc4
commit | 560beb5079df6fa4d14fa2dbd68566ce429f8c5b | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Wed Aug 14 12:18:59 2013 -0700 |
committer | Shawn Pearce <sop@google.com> | Wed Aug 14 12:18:59 2013 -0700 |
tree | a0e4d49ea56e236f33dfee4519115b8c86aa459f | |
parent | 5995feb5abe2834998a9809cdcfc65efd994397d [diff] | |
parent | f238e6fefa9715422ceeabb4ba875ebf12cb50b8 [diff] |
Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Fix browser NPE when ChangeCache is incomplete Conflicts: gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java Change-Id: Ib1c1166426c65c5ae44cb2146bc4566b38c16cc4