Merge remote-tracking branch 'btellier/JAMES-2314-awaitStop'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3aff481a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3aff481a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3aff481a Branch: refs/heads/master Commit: 3aff481af6be67b05c0785e9c5bb7de0d009327d Parents: 719e254 c85b4a6 Author: Antoine Duprat <[email protected]> Authored: Mon Nov 5 11:42:55 2018 +0100 Committer: Antoine Duprat <[email protected]> Committed: Mon Nov 5 11:42:55 2018 +0100 ---------------------------------------------------------------------- .../org/apache/james/webadmin/WebAdminServer.java | 1 + .../apache/james/webadmin/routes/ErrorRoutesTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
