Commit ae667396 authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'master' into develop

Cleaned up logging in stress tests.

Conflicts:
	RELEASE.md
	config/VERSION
	src/lib/bus/listener.c
	src/lib/kinetic_allocator.c
	src/lib/kinetic_client.c
	src/lib/kinetic_hmac.c
	src/lib/kinetic_operation.c
	src/lib/kinetic_types_internal.c
	test/system/test_system_bus.c
	test/system/test_system_erase.c
	test/system/test_system_get.c
	test/system/test_system_get_log.c
	test/system/test_system_getkeyrange.c
	test/system/test_system_getnext_getprevious.c
	test/system/test_system_p2pop.c
	test/system/test_system_put.c
	test/unit/test_kinetic_pdu.c
parents ffa5bce2 9f666f70
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment