Merge branch 'feature/parallel_upstreams' into feature/new_settings

This commit is contained in:
Sara Dickinson 2017-03-17 17:48:52 +00:00
commit d8f4aebdee
1 changed files with 2 additions and 2 deletions

View File

@ -26,13 +26,13 @@ getdns_context_get_limit_outstanding_queries
getdns_context_get_namespaces getdns_context_get_namespaces
getdns_context_get_num_pending_requests getdns_context_get_num_pending_requests
getdns_context_get_resolution_type getdns_context_get_resolution_type
getdns_context_get_round_robin_upstreams
getdns_context_get_suffix getdns_context_get_suffix
getdns_context_get_timeout getdns_context_get_timeout
getdns_context_get_tls_authentication getdns_context_get_tls_authentication
getdns_context_get_tls_backoff_time getdns_context_get_tls_backoff_time
getdns_context_get_tls_connection_retries getdns_context_get_tls_connection_retries
getdns_context_get_tls_query_padding_blocksize getdns_context_get_tls_query_padding_blocksize
getdns_context_get_round_robin_upstreams
getdns_context_get_update_callback getdns_context_get_update_callback
getdns_context_get_upstream_recursive_servers getdns_context_get_upstream_recursive_servers
getdns_context_process_async getdns_context_process_async
@ -59,13 +59,13 @@ getdns_context_set_memory_functions
getdns_context_set_namespaces getdns_context_set_namespaces
getdns_context_set_resolution_type getdns_context_set_resolution_type
getdns_context_set_return_dnssec_status getdns_context_set_return_dnssec_status
getdns_context_set_round_robin_upstreams
getdns_context_set_suffix getdns_context_set_suffix
getdns_context_set_timeout getdns_context_set_timeout
getdns_context_set_tls_authentication getdns_context_set_tls_authentication
getdns_context_set_tls_backoff_time getdns_context_set_tls_backoff_time
getdns_context_set_tls_connection_retries getdns_context_set_tls_connection_retries
getdns_context_set_tls_query_padding_blocksize getdns_context_set_tls_query_padding_blocksize
getdns_context_set_round_robin_upstreams
getdns_context_set_update_callback getdns_context_set_update_callback
getdns_context_set_upstream_recursive_servers getdns_context_set_upstream_recursive_servers
getdns_context_set_use_threads getdns_context_set_use_threads