search

basho / riak_cs

Riak CS is simple, available cloud storage built on Riak.
http://docs.basho.com/riakcs/latest/
Apache License 2.0
566 stars 95 forks source link

[WIP] Forward merge 2.0 dd0bc89 to 2.1 #1267

Closed shino closed 8 years ago

shino commented 8 years ago

Still WIP because 2.1 scope is not strictly defined. This PR shows that merging 2.0 to 2.1 have only one conflict which is expected and simple.

shino commented 8 years ago

Forward merge will happen after 2.0.x releases. Close this.