Skip to content

Feature Branch Merge -- DOC-8132; 8591; 8590; 8272; 8142 #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 4, 2021

Conversation

ibsoln
Copy link
Contributor

@ibsoln ibsoln commented Aug 4, 2021

DOC-8132 -- C language infrastructure … 47efbf6
DOC-8591 -- JSON API Methods … 60cbe1f
DOC-8590 -- JSON Results Code Snippet Changes …da61866
DOC-8272 -- N1QL Query … d3d3107
DOC-8142 -- KOtlin Infrastructure changes …

https://issues.couchbase.com/browse/DOC-8132
https://issues.couchbase.com/browse/DOC-8590
https://issues.couchbase.com/browse/DOC-8591
https://issues.couchbase.com/browse/DOC-8272
https://issues.couchbase.com/browse/DOC-8142

ibsoln added 6 commits August 4, 2021 09:39
https://issues.couchbase.com/browse/DOC-8132

clang-prep -- interim 210628--1358

(cherry picked from commit bc1bdb379f32dff15fe5fe9607f79bf1d9dace8d)

clang-prep -- INterim 210629-1153

(cherry picked from commit 3cfd3a9dbde40b400425dfc22110211bc7ba7a79)
(cherry picked from commit a1a976bc6836246d130d948829d5ad053f889957)
https://issues.couchbase.com/browse/DOC-8591

DOC-8064 -- interim 210513-1 -- initial content

interim 210601

DOC-8591 -- JSONAPI initialSwift code snips

DOC-8591 -- jsonresults incusion

DOC-8591-JSON-Methods -- homogenize objc and java doc.adoc

DOC-8591 -- Blobs

DOC-8591 -- Update JSON Results callouts

DOC-8591-JSON-Methods -- Sperate results sets page

DOC-8591 -- fix swift resultset page

(cherry picked from commit c9adf9a8ce61b0395205ab57e2188fe8cf63a63b)
https://issues.couchbase.com/browse/DOC-8590

DOC-8590-C3.0-Code -- Code update better deserialzation examples

DOC-8590-C3.0-Code -- Code update better deserialzation examples

DOC-8590 -- JSON Results Code Snippet Changes
https://issues.couchbase.com/browse/DOC-8590

DOC-8590-C3.0-Code -- include iOS feedback

DOC-8590-C3.0-Code -- Update C# for Json results

DOC-8590-C3.0-Code -- Code update better deserialzation examples

(cherry picked from commit cdfa8fb)
Interim 210601-1430

DOC-8272-N1QL -- Interim CLANG pages

DOC-8272-N1QL -- Interim 210615

DOC-8272-NQL -- run

DOC-8272-N1QL -- Select

DOC-8272-N1QL -- Commonize results set page

DOC-8272-N1QL -- Interim 210729

(cherry picked from commit 66c5680615f60f20dd0d34a72c6211ec81f4f4d0)
https://issues.couchbase.com/browse/DOC-8142

DOC-8142 -- Kotlin Insfrastructure Changes INITIAL

DOC-8142 -- Kotlin Interim 210730

DOC-8142 -- Kotlin Interim 210730-1044

DOC-8142 -- Kotlin Interim 210803-1643

DOC-8142 -- Kotlin Interim 210803-1656

DOC-8142 -- Kotlin Interim 210803-1800

(cherry picked from commit 91fb33a9a6328cbb8c82f59172378ab69814085e)
@ibsoln ibsoln merged commit 80f8348 into couchbase:release/3.0 Aug 4, 2021
@ibsoln ibsoln deleted the stage300 branch August 4, 2021 09:06
ibsoln added a commit to ibsoln/docs-couchbase-lite that referenced this pull request Aug 11, 2021
* DOC-8132 -- C language infrastructure
https://issues.couchbase.com/browse/DOC-8132

clang-prep -- interim 210628--1358

(cherry picked from commit bc1bdb379f32dff15fe5fe9607f79bf1d9dace8d)

clang-prep -- INterim 210629-1153

(cherry picked from commit 3cfd3a9dbde40b400425dfc22110211bc7ba7a79)
(cherry picked from commit a1a976bc6836246d130d948829d5ad053f889957)

* DOC-8591 -- JSON API Methods
https://issues.couchbase.com/browse/DOC-8591

DOC-8064 -- interim 210513-1 -- initial content

interim 210601

DOC-8591 -- JSONAPI initialSwift code snips

DOC-8591 -- jsonresults incusion

DOC-8591-JSON-Methods -- homogenize objc and java doc.adoc

DOC-8591 -- Blobs

DOC-8591 -- Update JSON Results callouts

DOC-8591-JSON-Methods -- Sperate results sets page

DOC-8591 -- fix swift resultset page

(cherry picked from commit c9adf9a8ce61b0395205ab57e2188fe8cf63a63b)

* DOC-8590 -- JSON Results Code Snippet Changes
https://issues.couchbase.com/browse/DOC-8590

DOC-8590-C3.0-Code -- Code update better deserialzation examples

DOC-8590-C3.0-Code -- Code update better deserialzation examples

DOC-8590 -- JSON Results Code Snippet Changes
https://issues.couchbase.com/browse/DOC-8590

DOC-8590-C3.0-Code -- include iOS feedback

DOC-8590-C3.0-Code -- Update C# for Json results

DOC-8590-C3.0-Code -- Code update better deserialzation examples

(cherry picked from commit cdfa8fb)

* DOC-8272 -- N1QL Query

Interim 210601-1430

DOC-8272-N1QL -- Interim CLANG pages

DOC-8272-N1QL -- Interim 210615

DOC-8272-NQL -- run

DOC-8272-N1QL -- Select

DOC-8272-N1QL -- Commonize results set page

DOC-8272-N1QL -- Interim 210729

(cherry picked from commit 66c5680615f60f20dd0d34a72c6211ec81f4f4d0)

* stage300 -- regress n1QL use of block_show_snippet

* DOC-8142 -- KOtlin Infrastructure changes
https://issues.couchbase.com/browse/DOC-8142

DOC-8142 -- Kotlin Insfrastructure Changes INITIAL

DOC-8142 -- Kotlin Interim 210730

DOC-8142 -- Kotlin Interim 210730-1044

DOC-8142 -- Kotlin Interim 210803-1643

DOC-8142 -- Kotlin Interim 210803-1656

DOC-8142 -- Kotlin Interim 210803-1800

(cherry picked from commit 91fb33a9a6328cbb8c82f59172378ab69814085e)
ibsoln added a commit to ibsoln/docs-couchbase-lite that referenced this pull request Aug 11, 2021
* DOC-8132 -- C language infrastructure
https://issues.couchbase.com/browse/DOC-8132

clang-prep -- interim 210628--1358

(cherry picked from commit bc1bdb379f32dff15fe5fe9607f79bf1d9dace8d)

clang-prep -- INterim 210629-1153

(cherry picked from commit 3cfd3a9dbde40b400425dfc22110211bc7ba7a79)
(cherry picked from commit a1a976bc6836246d130d948829d5ad053f889957)

* DOC-8591 -- JSON API Methods
https://issues.couchbase.com/browse/DOC-8591

DOC-8064 -- interim 210513-1 -- initial content

interim 210601

DOC-8591 -- JSONAPI initialSwift code snips

DOC-8591 -- jsonresults incusion

DOC-8591-JSON-Methods -- homogenize objc and java doc.adoc

DOC-8591 -- Blobs

DOC-8591 -- Update JSON Results callouts

DOC-8591-JSON-Methods -- Sperate results sets page

DOC-8591 -- fix swift resultset page

(cherry picked from commit c9adf9a8ce61b0395205ab57e2188fe8cf63a63b)

* DOC-8590 -- JSON Results Code Snippet Changes
https://issues.couchbase.com/browse/DOC-8590

DOC-8590-C3.0-Code -- Code update better deserialzation examples

DOC-8590-C3.0-Code -- Code update better deserialzation examples

DOC-8590 -- JSON Results Code Snippet Changes
https://issues.couchbase.com/browse/DOC-8590

DOC-8590-C3.0-Code -- include iOS feedback

DOC-8590-C3.0-Code -- Update C# for Json results

DOC-8590-C3.0-Code -- Code update better deserialzation examples

(cherry picked from commit cdfa8fb)

* DOC-8272 -- N1QL Query

Interim 210601-1430

DOC-8272-N1QL -- Interim CLANG pages

DOC-8272-N1QL -- Interim 210615

DOC-8272-NQL -- run

DOC-8272-N1QL -- Select

DOC-8272-N1QL -- Commonize results set page

DOC-8272-N1QL -- Interim 210729

(cherry picked from commit 66c5680615f60f20dd0d34a72c6211ec81f4f4d0)

* stage300 -- regress n1QL use of block_show_snippet

* DOC-8142 -- KOtlin Infrastructure changes
https://issues.couchbase.com/browse/DOC-8142

DOC-8142 -- Kotlin Insfrastructure Changes INITIAL

DOC-8142 -- Kotlin Interim 210730

DOC-8142 -- Kotlin Interim 210730-1044

DOC-8142 -- Kotlin Interim 210803-1643

DOC-8142 -- Kotlin Interim 210803-1656

DOC-8142 -- Kotlin Interim 210803-1800

(cherry picked from commit 91fb33a9a6328cbb8c82f59172378ab69814085e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant