int port = config.getHttpConfiguration().getPort();
        int adminPort = config.getHttpConfiguration().getAdminPort();

<<<<<<< HEAD
        Map payload = ImmutableMap.builder()
                .put("url", new URL("http", ip, port, "/" + getName()))
                .put("adminUrl", new URL("http", ip, adminPort, ""))
                .build();
        ServiceEndpoint endpoint = new ServiceEndpoint(getName(), ip, port, JsonHelper.toJson(payload));
=======
        // The client reads the URLs out of the payload to figure out how to connect to this server.
        String payload = getJson().writeValueAsString(ImmutableMap.builder()
                .put("url", new URL("http", hostname, port, "/" + getName()))
                .put("adminUrl", new URL("http", hostname, adminPort, ""))
                .build());
        final ServiceEndpoint endpoint = new ServiceEndpoint(getName(), hostname, port, payload);
>>>>>>> 6cbe0b324f0edd981b8e190e3bb0442397b8edda

        // Once everything has initialized successfully, register services with ZooKeeper where clients can find them.
        ZooKeeperConnection connection = config.getZooKeeperConfiguration().connect();

        int port = config.getHttpConfiguration().getPort();
        int adminPort = config.getHttpConfiguration().getAdminPort();

        // The client reads the URLs out of the payload to figure out how to connect to this server.
        String payload = getJson().writeValueAsString(ImmutableMap.builder()
                .put("url", new URL("http", ip, port, "/" + getName()))
                .put("adminUrl", new URL("http", ip, adminPort, ""))
                .build());
        final ServiceEndpoint endpoint = new ServiceEndpoint(getName(), ip, port, payload);

        // Once everything has initialized successfully, register services with ZooKeeper where clients can find them.
        ZooKeeperConnection connection = config.getZooKeeperConfiguration().connect();