| commit | b3faa893a53440ac7bcce120b650d575023ce2ae | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Mon Nov 18 08:41:02 2013 -0800 |
| committer | Shawn Pearce <sop@google.com> | Mon Nov 18 08:41:02 2013 -0800 |
| tree | dd240eae65f8ac7e979117a0f0f6c633914f172e | |
| parent | 6a71917078c93cfc184498e34f958964e0efdec2 [diff] | |
| parent | 5174e351474960a616a17a9625d68b1fc0f291a4 [diff] |
Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Catch missing LDAP accounts in group membership Update patch status before skipping duplicate emails Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java Change-Id: If7173d50f09fa799e1cdd02e68b88aab00f1a1d9