| commit | 3764a0910765e85eb8ec7e46623da4cc1e9dbe4b | [log] [tgz] |
|---|---|---|
| author | Shawn O. Pearce <sop@google.com> | Thu May 24 22:32:58 2012 -0700 |
| committer | Shawn O. Pearce <sop@google.com> | Thu May 24 22:32:58 2012 -0700 |
| tree | ef7cf7bf996ce9a2fac28c0a1aa5a1e21b6492a0 | |
| parent | 5e43b81607930290ffe5f3540641196c6f1486ad [diff] | |
| parent | 2e1cb2b8495761a7e9abc09ebca24ca6bbf2afbe [diff] |
Merge branch 'cache' * cache: Back in-memory caches with Guava, disk caches with H2 Conflicts: gerrit-pgm/src/main/java/com/google/gerrit/pgm/ExportReviewNotes.java Change-Id: I598be24a77d017af2a540a4f256a08bddb2b6a60