Commit 569e2975 authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'develop' into feature/admin_api

parents 9e427163 8efd3fa0
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ PUB_INC = ./include
# SSL/TLS Library Options
#-------------------------------------------------------------------------------

# FIXME: Currently OSX/homebrew specific, rework before integration.
# This may need to be set if OpenSSL is in a nonstandard place.
OPENSSL_PATH ?=	.

#===============================================================================
@@ -488,7 +488,6 @@ examples: setup_examples \
	run_example_write_file_blocking \
	run_example_write_file_blocking_threads \
	run_example_write_file_nonblocking \
	run_example_write_file_nonblocking_threads \
	run_example_get_key_range \
	stop_simulator

@@ -499,6 +498,5 @@ valgrind_examples: setup_examples \
	valgrind_example_write_file_blocking \
	valgrind_example_write_file_blocking_threads \
	valgrind_example_write_file_nonblocking \
	valgrind_example_write_file_nonblocking_threads \
	valgrind_example_get_key_range \
	stop_simulator
+7 −1
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ Prerequisites
        * OSX (using [Homebrew](http://brew.sh/))
            * `> brew install openssl`
            
A release of OpenSSL that provides TLS 1.1 or newer is required.

If the OpenSSL installation is not found, the `OPENSSL_PATH` environment
variable may need to be set to its base path, e.g.
`/usr/local/openssl/1.0.1k/`.

Getting Started
---------------

@@ -86,7 +92,7 @@ Operations
        * Execute a Get operation to retrieve a key/value entry
    * `./bin/kinetic-c-util delete`
        * Execute a Delete operation to destroy a key/value entry
    * `./bin/kinetic-c-util instanterase`
    * `./bin/kinetic-c-util instanterase` *INCOMPLETE*
        * Execute an InstantSecureErase operation to erase ALL content from the device

Kinetic C Client I/O Examples
+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,12 @@ v0.10.0 (kinetic-protocol 3.0.5)
* Switched internal message infrastructure to use a threadpool. This will allow for a much higher number active connections and outstanding commands.
* KineticClient_Init now returns a KineticClient pointer (internally, it's a handle to the threadpool) that must be passed to KineticClient_CreateConnection() in order to create new connections and must also be passed to KineticClient_Shutdown() on shutdown
* Improved I/O examples to demonstrate client write operations for blocking/non-blocking (asynchrounous) and single/multi-threaded.
* Added consolidated performance test which reports metrics on PUT/GET/DELETE sequences (test/system/test_system_async_throughput.c).

v0.9.2 (kinetic-protocol 3.0.5)
-------------------------------
* Added missing mutex lock causing a concurrency issue.
* Added profiling to test/system/test_system_async_io.c

v0.9.1 (kinetic-protocol 3.0.5)
-------------------------------
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ PROJECT_NAME = kinetic-c
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER           = "v0.10.0-beta"
PROJECT_NUMBER           = "v0.10.0"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
+1 −1
Original line number Diff line number Diff line
0.10.0-beta
0.10.0
Loading