WIP: Riak Security - optional transport encryption

[lukebakken]

RIAK-2913

[thumbot]

features/lrb/ssl-optional-riak-2913 8461bd6	:arrow_right:	develop f40de3e	:no_entry: completed

[thumbot]

features/lrb/ssl-optional-riak-2913 8db8db9	:arrow_right:	develop f40de3e	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2016-12-02 07:52 > Duration: seconds. > Result: ERROR > Message: Merge Failed: features/lrb/ssl-optional-riak-2913 8db8db91bd3cba104ea7ed050aa8e31129bebc78 onto target branch: develop f40de3e6cc50beb1fa26487d46853a149d3518d2 > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: rebar.config src/riak_api_pb_server.erl src/riak_api_ssl.erl src/riak_api_web_security.erl Please, commit your changes or stash them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 8223ba1	:arrow_right:	develop f40de3e	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2016-12-02 09:36 > Duration: seconds. > Result: ERROR > Message: Merge Failed: features/lrb/ssl-optional-riak-2913 8223ba12ee586fa0e5503046a4d828a6cf244ed8 onto target branch: develop f40de3e6cc50beb1fa26487d46853a149d3518d2 > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: rebar.config src/riak_api_pb_server.erl src/riak_api_ssl.erl src/riak_api_web_security.erl Please, commit your changes or stash them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 a1b1f4a	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 08:00 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 a1b1f4a14f8c40b1dab3dff53364535e7748d2f4 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..a1b1f4a Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_pb_server.erl | 25 +++++++++++++++++++----- src/riak_api_ssl.erl | 4 ++-- src/riak_api_web_security.erl | 44 +++++++++++++++++++++++-------------------- 4 files changed, 47 insertions(+), 28 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 6fdcc0b	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 14:21 > Duration: 0 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 6fdcc0b1d8d450c6a4d2ef286761fd55fc2544b5 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..6fdcc0b Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_pb_server.erl | 25 +++++++++++++++++++----- src/riak_api_ssl.erl | 4 ++-- src/riak_api_web_security.erl | 44 +++++++++++++++++++++++-------------------- 4 files changed, 47 insertions(+), 28 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 7f41b53	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 14:48 > Duration: 0 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 7f41b53a3c34f2a9837dc02668696e2c40ff9f74 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..7f41b53 Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_pb_server.erl | 31 ++++++++++++++++----- src/riak_api_ssl.erl | 65 +++++++++++++++++++++++++++++-------------- src/riak_api_web_security.erl | 44 ++++++++++++++++------------- 4 files changed, 93 insertions(+), 49 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 1f86bba	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 15:39 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 1f86bba14dd07057476742a2951f642c3f0749f6 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..1f86bba Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 ++++++++++----- src/riak_api_pb_server.erl | 31 +++++++++++++++----- src/riak_api_ssl.erl | 67 ++++++++++++++++++++++--------------------- src/riak_api_web_security.erl | 44 +++++++++++++++------------- 5 files changed, 99 insertions(+), 68 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 3dc5dcd	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 15:47 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 3dc5dcda670173a0dc66755259ead643d5e1afb9 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..3dc5dcd Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 +++++++++----- src/riak_api_pb_server.erl | 31 ++++++++++++++----- src/riak_api_ssl.erl | 70 +++++++++++++++++++++++-------------------- src/riak_api_web_security.erl | 44 ++++++++++++++------------- 5 files changed, 102 insertions(+), 68 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 fa696c7	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 16:07 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 fa696c7e81e9be4bcf63b5ae560eab5e503e7342 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..fa696c7 Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 +++++++++----- src/riak_api_pb_server.erl | 31 ++++++++++++++----- src/riak_api_ssl.erl | 72 +++++++++++++++++++++++-------------------- src/riak_api_web_security.erl | 44 ++++++++++++++------------ 5 files changed, 104 insertions(+), 68 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 ca75a6f	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-19 16:10 > Duration: 6 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 ca75a6f546e49d95ad1b53c9562cd77c68985efd onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..ca75a6f Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 +++++++++----- src/riak_api_pb_server.erl | 31 ++++++++++++++----- src/riak_api_ssl.erl | 72 +++++++++++++++++++++++-------------------- src/riak_api_web_security.erl | 44 ++++++++++++++------------ 5 files changed, 104 insertions(+), 68 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 9277b9a	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-20 10:01 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 9277b9a21955aa435dce5b20736f2afe7bdcddab onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..9277b9a Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 ++++++++---- src/riak_api_pb_server.erl | 81 +++++++++++++++++++++++-------------------- src/riak_api_ssl.erl | 73 ++++++++++++++++++++------------------ src/riak_api_web_security.erl | 44 ++++++++++++----------- 5 files changed, 125 insertions(+), 98 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 4b470d7	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-20 11:17 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 4b470d736afe618ec7f6350fb7a225b26e3d8615 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..4b470d7 Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 ++++++++---- src/riak_api_pb_server.erl | 83 +++++++++++++++++++++++-------------------- src/riak_api_ssl.erl | 73 ++++++++++++++++++++----------------- src/riak_api_web_security.erl | 44 ++++++++++++----------- 5 files changed, 126 insertions(+), 99 deletions(-) ``` --------------------------------------------------

[thumbot]

features/lrb/ssl-optional-riak-2913 1c3af07	:arrow_right:	develop 8cecaba	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2016-12-20 13:34 > Duration: 1 seconds. > Result: OK > Message: Merge Success: features/lrb/ssl-optional-riak-2913 1c3af0770d429260a2d309cc72af8d7322678c08 onto target branch: develop 8cecabaeeefa41ce6992a9b529fa8fe4e3b03ab4 > Exit Code: OK > :page_facing_up:

``` Updating 8cecaba..1c3af07 Fast-forward (no commit created; -m option ignored) rebar.config | 2 +- src/riak_api_app.erl | 23 ++++++++---- src/riak_api_pb_server.erl | 81 +++++++++++++++++++++++-------------------- src/riak_api_ssl.erl | 73 ++++++++++++++++++++------------------ src/riak_api_web_security.erl | 44 ++++++++++++----------- 5 files changed, 124 insertions(+), 99 deletions(-) ``` --------------------------------------------------

[lukebakken]

Closed, see basho/riak_api#119 (RIAK-2423)