Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/93b6d030
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/93b6d030
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/93b6d030
Branch: refs/heads/ValueSerializationCleaning
Commit: 93b6d0302aa8a74ccce1689464405b518ad5f95c
Parents: 8915dfa 17543d3
Author: Niclas Hedhman <niclas@hedhman.org>
Authored: Thu Jun 16 10:30:42 2016 +0800
Committer: Niclas Hedhman <niclas@hedhman.org>
Committed: Thu Jun 16 10:30:42 2016 +0800
----------------------------------------------------------------------
.../org/apache/zest/test/util/RetryRule.java | 55 ++++++++++++++++++++
.../apache/zest/test/cache/RetryRuleTest.java | 22 ++++++++
.../zest/library/metrics/MetricsTest.java | 4 ++
.../rest/admin/RestServerConfiguration.java | 32 ++++++++++++
.../library/rest/admin/RestServerMixin.java | 9 +++-
.../zest/library/rest/admin/RestTest.java | 35 ++++++++++---
6 files changed, 148 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
|