Commit 0ca44206 authored by Greg Williams's avatar Greg Williams
Browse files

Merged branch 'master' into develop.

Fixed conflicts in:
	Makefile
	src/lib/kinetic_controller.c
	src/lib/kinetic_logger.c
	src/lib/kinetic_operation.c
	test/system/test_system_async_throughput.c
	test/system/test_system_getkeyrange.c
	test/system/test_system_getnext_getprevious.c
	test/system/test_system_noop.c
	test/system/test_system_stress_session_per_thread.c
	test/system/test_system_stress_single_session_threaded.c
	vendor/kinetic-simulator/startSimulators.sh
	vendor/kinetic-simulator/stopSimulators.sh
Removed erroneous license addition to greatest test framework.
parents 4c2f9056 9a089389
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment