Merge branch 'CURATOR-114' of github.com:cammckenzie/curator into CURATOR-114
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c885c8fa Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c885c8fa Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c885c8fa Branch: refs/heads/master Commit: c885c8fac3ef1c6450dedd173dd1ef6baae826bb Parents: 95893ad 67dbfad Author: randgalt <randg...@apache.org> Authored: Wed Jun 18 09:12:58 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed Jun 18 09:12:58 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/curator/test/TestingServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
