Merge branch 'master' into CURATOR-426
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b57f9ef6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b57f9ef6 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b57f9ef6 Branch: refs/heads/CURATOR-426 Commit: b57f9ef65c1c0fcf948da3f9d66e31c74d5e3db9 Parents: 329729a 840b434 Author: randgalt <[email protected]> Authored: Fri Jul 21 12:50:52 2017 -0500 Committer: randgalt <[email protected]> Committed: Fri Jul 21 12:50:52 2017 -0500 ---------------------------------------------------------------------- .../server/jetty_resteasy/TestStringsWithRestEasy.java | 6 +++--- pom.xml | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/b57f9ef6/pom.xml ----------------------------------------------------------------------
