Projects >> titan >>d8a4cb32fa02bf240e7357d5e14d349094905a2e

Chunk
Conflicting content
     */
    public static final ConfigOption IDAUTHORITY_WAIT = new ConfigOption<>(IDAUTHORITY_NS,"wait-time",
            "The number of milliseconds the system waits for an ID block reservation to be acknowledged by the storage backend",
<<<<<<< HEAD
            ConfigOption.Type.GLOBAL_OFFLINE, Duration.class, new StandardDuration(300L, TimeUnit.MILLISECONDS));
=======
            ConfigOption.Type.GLOBAL_OFFLINE, new StandardDuration(300L, TimeUnit.MILLISECONDS));
//    public static final String IDAUTHORITY_WAIT_MS_KEY = "idauthority-wait-time";
//    public static final long IDAUTHORITY_WAIT_MS_DEFAULT = 300;
>>>>>>> d19a8f1485ace42a79a0d729e2ae4cabe83b45cb

    /**
     * Sets the strategy used by {@link ConsistentKeyIDAuthority} to avoid
Solution content
     */
    public static final ConfigOption IDAUTHORITY_WAIT = new ConfigOption<>(IDAUTHORITY_NS,"wait-time",
            "The number of milliseconds the system waits for an ID block reservation to be acknowledged by the storage backend",
            ConfigOption.Type.GLOBAL_OFFLINE, new StandardDuration(300L, TimeUnit.MILLISECONDS));
//    public static final String IDAUTHORITY_WAIT_MS_KEY = "idauthority-wait-time";
//    public static final long IDAUTHORITY_WAIT_MS_DEFAULT = 300;

    /**
     * Sets the strategy used by {@link ConsistentKeyIDAuthority} to avoid
File
GraphDatabaseConfiguration.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation