Merge branch 'master' into CURATOR-425
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/63f83104 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/63f83104 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/63f83104 Branch: refs/heads/CURATOR-426 Commit: 63f83104d8b7fc086ad92ba166ce58e1897646be Parents: 334950f 840b434 Author: randgalt <randg...@apache.org> Authored: Fri Jul 21 12:49:39 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Fri Jul 21 12:49:39 2017 -0500 ---------------------------------------------------------------------- .../server/jetty_resteasy/TestStringsWithRestEasy.java | 6 +++--- pom.xml | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/63f83104/pom.xml ----------------------------------------------------------------------
