summaryrefslogtreecommitdiff
path: root/api-ref
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-18 15:50:39 +0000
committerGerrit Code Review <review@openstack.org>2016-11-18 15:50:39 +0000
commit48dcbb6dcd1b120e668d8330104a6c63a3c01a96 (patch)
treef7a83b7dd3d35f1293f13c1373d3b2a9ad3c9952 /api-ref
parentfef848fbb2ee1ceddbe0222f0031e1d0779ba86b (diff)
parent3f93ff110bec754e5a3d955fef2daaed3510aaf4 (diff)
downloadtrove-48dcbb6dcd1b120e668d8330104a6c63a3c01a96.tar.gz
Merge "Multi-Region Support"
Diffstat (limited to 'api-ref')
-rw-r--r--api-ref/source/samples/db-backup-restore-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-backup-restore-response.json1
-rw-r--r--api-ref/source/samples/db-create-instance-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-create-instance-response.json1
-rw-r--r--api-ref/source/samples/db-instance-status-detail-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-instance-status-detail-response.json1
-rw-r--r--api-ref/source/samples/db-instances-index-pagination-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-instances-index-pagination-response.json2
-rw-r--r--api-ref/source/samples/db-instances-index-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-instances-index-response.json1
-rw-r--r--api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-mgmt-get-instance-details-response.json1
-rw-r--r--api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt2
-rw-r--r--api-ref/source/samples/db-mgmt-instance-index-response.json1
14 files changed, 15 insertions, 7 deletions
diff --git a/api-ref/source/samples/db-backup-restore-response-json-http.txt b/api-ref/source/samples/db-backup-restore-response-json-http.txt
index 2ce0d753..ce9bfb08 100644
--- a/api-ref/source/samples/db-backup-restore-response-json-http.txt
+++ b/api-ref/source/samples/db-backup-restore-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 694
+Content-Length: 717
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-backup-restore-response.json b/api-ref/source/samples/db-backup-restore-response.json
index 005899d1..cafd6197 100644
--- a/api-ref/source/samples/db-backup-restore-response.json
+++ b/api-ref/source/samples/db-backup-restore-response.json
@@ -31,6 +31,7 @@
}
],
"name": "backup_instance",
+ "region": "RegionOne",
"status": "BUILD",
"updated": "2014-10-30T12:30:00",
"volume": {
diff --git a/api-ref/source/samples/db-create-instance-response-json-http.txt b/api-ref/source/samples/db-create-instance-response-json-http.txt
index 21284541..646d02a6 100644
--- a/api-ref/source/samples/db-create-instance-response-json-http.txt
+++ b/api-ref/source/samples/db-create-instance-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 697
+Content-Length: 720
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-create-instance-response.json b/api-ref/source/samples/db-create-instance-response.json
index a1bf8e9a..47e75bfe 100644
--- a/api-ref/source/samples/db-create-instance-response.json
+++ b/api-ref/source/samples/db-create-instance-response.json
@@ -31,6 +31,7 @@
}
],
"name": "json_rack_instance",
+ "region": "RegionOne",
"status": "BUILD",
"updated": "2014-10-30T12:30:00",
"volume": {
diff --git a/api-ref/source/samples/db-instance-status-detail-response-json-http.txt b/api-ref/source/samples/db-instance-status-detail-response-json-http.txt
index 0825e835..ab457b30 100644
--- a/api-ref/source/samples/db-instance-status-detail-response-json-http.txt
+++ b/api-ref/source/samples/db-instance-status-detail-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 712
+Content-Length: 735
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-instance-status-detail-response.json b/api-ref/source/samples/db-instance-status-detail-response.json
index fa96976a..eacb3fc4 100644
--- a/api-ref/source/samples/db-instance-status-detail-response.json
+++ b/api-ref/source/samples/db-instance-status-detail-response.json
@@ -31,6 +31,7 @@
}
],
"name": "json_rack_instance",
+ "region": "RegionOne",
"status": "ACTIVE",
"updated": "2014-10-30T12:30:00",
"volume": {
diff --git a/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt b/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt
index 0ab8faf1..b1c87ce6 100644
--- a/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt
+++ b/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 1251
+Content-Length: 1297
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-instances-index-pagination-response.json b/api-ref/source/samples/db-instances-index-pagination-response.json
index 9dcd8480..85569350 100644
--- a/api-ref/source/samples/db-instances-index-pagination-response.json
+++ b/api-ref/source/samples/db-instances-index-pagination-response.json
@@ -31,6 +31,7 @@
}
],
"name": "The Third Instance",
+ "region": "RegionOne",
"status": "ACTIVE",
"volume": {
"size": 2
@@ -67,6 +68,7 @@
}
],
"name": "json_rack_instance",
+ "region": "RegionOne",
"status": "ACTIVE",
"volume": {
"size": 2
diff --git a/api-ref/source/samples/db-instances-index-response-json-http.txt b/api-ref/source/samples/db-instances-index-response-json-http.txt
index f7a85bd0..dd2cde67 100644
--- a/api-ref/source/samples/db-instances-index-response-json-http.txt
+++ b/api-ref/source/samples/db-instances-index-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 633
+Content-Length: 656
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-instances-index-response.json b/api-ref/source/samples/db-instances-index-response.json
index c644e7c8..341308ea 100644
--- a/api-ref/source/samples/db-instances-index-response.json
+++ b/api-ref/source/samples/db-instances-index-response.json
@@ -31,6 +31,7 @@
}
],
"name": "json_rack_instance",
+ "region": "RegionOne",
"status": "ACTIVE",
"volume": {
"size": 2
diff --git a/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt b/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt
index 97dd151e..4aa235cb 100644
--- a/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt
+++ b/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 1533
+Content-Length: 1556
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-mgmt-get-instance-details-response.json b/api-ref/source/samples/db-mgmt-get-instance-details-response.json
index c58aeb20..2d08d35e 100644
--- a/api-ref/source/samples/db-mgmt-get-instance-details-response.json
+++ b/api-ref/source/samples/db-mgmt-get-instance-details-response.json
@@ -36,6 +36,7 @@
}
],
"name": "json_rack_instance",
+ "region": "RegionOne",
"root_enabled": "2014-10-30T12:30:00",
"root_enabled_by": "3000",
"server": {
diff --git a/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt b/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt
index 6eb4f3ca..9acc8236 100644
--- a/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt
+++ b/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt
@@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
-Content-Length: 1082
+Content-Length: 1105
Date: Mon, 18 Mar 2013 19:09:17 GMT
diff --git a/api-ref/source/samples/db-mgmt-instance-index-response.json b/api-ref/source/samples/db-mgmt-instance-index-response.json
index 9c6eb89f..a29a2fce 100644
--- a/api-ref/source/samples/db-mgmt-instance-index-response.json
+++ b/api-ref/source/samples/db-mgmt-instance-index-response.json
@@ -34,6 +34,7 @@
}
],
"name": "json_rack_instance",
+ "region": "RegionOne",
"server": {
"deleted": false,
"deleted_at": null,