Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/mina into trunk
Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/9177043b Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/9177043b Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/9177043b Branch: refs/heads/trunk Commit: 9177043b10151b0fb3a4c284f92beec408dd8788 Parents: 6eb647e 8bf8227 Author: Julien Vermillard <jvermill...@apache.org> Authored: Tue Jan 15 20:01:24 2013 +0100 Committer: Julien Vermillard <jvermill...@apache.org> Committed: Tue Jan 15 20:01:24 2013 +0100 ---------------------------------------------------------------------- ...ina3ClientVsMina3ServerBenchmarkBinaryTest.java | 9 ++- ...ettyClientVsNettyServerBenchmarkBinaryTest.java | 13 ++- core/pom.xml | 81 ++++++++------ 3 files changed, 64 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
