Kubernetes Submit Queue 01ac994541
Merge pull request #40689 from deads2k/add-details-to-patch-err ...
Automatic merge from submit-queue (batch tested with PRs 39169, 40719, 38954, 40808, 40689)
add details to patch conflict
Adds conflict details to the patch message so we can debug #39471 . Seems like this may have general utility since others may also wonder what they conflicted on.
@sig-api
2017-02-02 02:05:24 -08:00
2017-02-02 06:58:58 +01:00
2017-01-29 21:41:45 +01:00
2017-02-02 06:58:29 +01:00
2017-01-27 08:55:44 -05:00
2017-01-05 14:14:13 -08:00
2017-02-01 18:03:42 -07:00
2017-01-31 20:40:47 -08:00
2017-02-02 02:05:21 -08:00
2017-01-22 15:41:06 -08:00
2017-01-25 00:40:02 -08:00
2017-01-24 20:56:03 +01:00
2017-01-30 09:05:22 -08:00
2017-01-19 09:50:16 -05:00
2017-02-01 12:06:39 -08:00
2017-02-02 02:05:24 -08:00
2017-01-05 14:14:13 -08:00
2017-02-01 15:18:33 -05:00
2017-02-01 00:16:39 -08:00
2017-02-01 23:19:02 -08:00
2017-01-31 19:14:13 -05:00
2017-01-17 08:07:30 -05:00
2017-01-30 20:05:18 -08:00
2017-01-23 17:52:46 -05:00
2017-01-11 09:09:48 -05:00
2017-01-31 19:14:13 -05:00
2017-01-29 21:41:45 +01:00
2017-02-02 02:05:22 -08:00
2017-01-19 13:06:47 +01:00
2017-01-17 08:07:30 -05:00
2017-01-24 20:56:03 +01:00
2017-01-27 12:25:46 -08:00
2017-02-01 10:18:58 -05:00
2017-01-13 14:04:54 -05:00
2017-02-01 13:49:28 +01:00
2017-01-17 08:07:30 -05:00
2017-01-31 21:27:52 -08:00
2017-01-17 12:34:05 +01:00
2017-01-31 19:14:13 -05:00
2017-01-17 08:07:30 -05:00
2017-01-31 20:40:45 -08:00
2017-01-19 11:29:16 -08:00
01ac994541