diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-09-22 10:37:49 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-09-22 10:37:49 +0000 |
commit | 5767d9b188cd3efadbd30e2decd963c0d168fdbc (patch) | |
tree | 6ba9f61ce8d24ea8b5707aa21bb6600f8d08e84f /vespalog/src/main/java/com/yahoo/log/LogMessage.java | |
parent | c9f97f7effb5fcd2a8ffe620258cd5629fb7dc73 (diff) | |
parent | f4a65c8f7cb27bd0e449d99e223ba1a0d9135049 (diff) |
Merge branch 'master' into bratseth/nonfunctional-changes-4
Conflicts:
vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java
Diffstat (limited to 'vespalog/src/main/java/com/yahoo/log/LogMessage.java')
-rw-r--r-- | vespalog/src/main/java/com/yahoo/log/LogMessage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/LogMessage.java b/vespalog/src/main/java/com/yahoo/log/LogMessage.java index 608290026b6..1e2b9dfdab0 100644 --- a/vespalog/src/main/java/com/yahoo/log/LogMessage.java +++ b/vespalog/src/main/java/com/yahoo/log/LogMessage.java @@ -15,7 +15,7 @@ import com.yahoo.log.event.MalformedEventException; * chosen the name LogMessage to avoid confusion with LogRecord * which is used in java.util.logging. * - * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> + * @author Bjorn Borud */ public class LogMessage { |