| commit | b72a8525f075cd099184ed58a6190c637d08bf62 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Wed Oct 09 09:40:30 2013 -0700 |
| committer | Shawn Pearce <sop@google.com> | Wed Oct 09 09:40:30 2013 -0700 |
| tree | 4d4a7e0bfeddf6b335565ad2a6744fd5059b3541 | |
| parent | 4ab88724fe155aa7efb1aafe3fe00733e690ecf0 [diff] | |
| parent | f8237318a9f5229b6b79680497af69b825946bc4 [diff] |
Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Use LogManager.DEFAULT_CONFIGURATION_KEY Skip internal logging conf when external one was provided