Commit 0127a83f authored by Greg Williams's avatar Greg Williams
Browse files

Fixed some minor merge issues.

parent 067894f9

RELEASE.md

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ v0.12.0 (kinetic-protocol 3.0.5) 
--------------------------------

* `KineticSession` is now supplied as an opaque instance pointer from `KineticClient_CreateSession`

    * Passed `KineticClientConfig` is now deep copied and can be discarded after session creation.

* Updated KineticClient_Put to allow storing an object with an empty value with a NULL data pointer supplied.

* Added new KineticAdminClient API (see `include/kinetic_admin_client.h`)

* Updated `KineticClient_Put` to allow storing an object with an empty value with a NULL data pointer supplied.

* Added new `KineticAdminClient` API (see `include/kinetic_admin_client.h`)

    * Reloacted existing admin methods to admin API

        * `KineticClient_InstantSecureErase` => `KineticAdminClient_InstantErase`/`KineticAdminClient_SecureErase`

        * `KineticClient_GetLog` => `KineticAdminClient_GetLog`

cleanhouse.diff

deleted100644 → 0
+0 −2582

File deleted.

Preview size limit exceeded, changes collapsed.

config/Doxyfile

+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.11.2"

PROJECT_NUMBER           = "v0.12.0-beta"



# 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