Remove extra ^M for json file

There is a ^M symbol in the end of each line in
instance-shelve_offload-end.json, remove that.

Change-Id: I9eac6348f9714dfe637ea8cee01a8c1b6ca5f051

diff --git a/doc/notification_samples/instance-shelve_offload-end.json b/doc/notification_samples/instance-shelve_offload-end.json
index 9199d685044f41f904e67f9631c51725eba16377..ef10a0c0c55807dd30d3a242fb395c799ea8baec 100644 (file)
--- a/doc/notification_samples/instance-shelve_offload-end.json
+++ b/doc/notification_samples/instance-shelve_offload-end.json
@@ -1,62 +1,62 @@
-{\r
-    "event_type":"instance.shelve_offload.end",\r
-    "payload":{\r
-        "nova_object.data":{\r
-            "architecture":"x86_64",\r
-            "availability_zone":null,\r
-            "created_at":"2012-10-29T13:42:11Z",\r
-            "deleted_at":null,\r
-            "display_name":"some-server",\r
-            "fault":null,\r
+{
+    "event_type":"instance.shelve_offload.end",
+    "payload":{
+        "nova_object.data":{
+            "architecture":"x86_64",
+            "availability_zone":null,
+            "created_at":"2012-10-29T13:42:11Z",
+            "deleted_at":null,
+            "display_name":"some-server",
+            "fault":null,
             "host":null,
-            "host_name":"some-server",\r
-            "ip_addresses": [{\r
-                "nova_object.name": "IpPayload",\r
-                "nova_object.namespace": "nova",\r
-                "nova_object.version": "1.0",\r
-                "nova_object.data": {\r
-                    "mac": "fa:16:3e:4c:2c:30",\r
-                    "address": "192.168.1.3",\r
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",\r
-                    "meta": {},\r
-                    "version": 4,\r
-                    "label": "private-network",\r
-                    "device_name": "tapce531f90-19"\r
-                }\r
-            }],\r
-            "kernel_id":"",\r
-            "launched_at":"2012-10-29T13:42:11Z",\r
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",\r
-            "metadata":{},\r
+            "host_name":"some-server",
+            "ip_addresses": [{
+                "nova_object.name": "IpPayload",
+                "nova_object.namespace": "nova",
+                "nova_object.version": "1.0",
+                "nova_object.data": {
+                    "mac": "fa:16:3e:4c:2c:30",
+                    "address": "192.168.1.3",
+                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
+                    "meta": {},
+                    "version": 4,
+                    "label": "private-network",
+                    "device_name": "tapce531f90-19"
+                }
+            }],
+            "kernel_id":"",
+            "launched_at":"2012-10-29T13:42:11Z",
+            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "metadata":{},
             "node":null,
-            "os_type":null,\r
-            "progress":0,\r
-            "ramdisk_id":"",\r
-            "reservation_id":"r-npxv0e40",\r
-            "state":"shelved_offloaded",\r
-            "task_state":null,\r
-            "power_state":"running",\r
-            "tenant_id":"6f70656e737461636b20342065766572",\r
-            "terminated_at":null,\r
-            "flavor": {\r
-                "nova_object.name": "FlavorPayload",\r
-                "nova_object.data": {\r
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",\r
-                    "root_gb": 1,\r
-                    "vcpus": 1,\r
-                    "ephemeral_gb": 0,\r
-                    "memory_mb": 512\r
-                },\r
-                "nova_object.version": "1.0",\r
-                "nova_object.namespace": "nova"\r
-            },\r
-            "user_id":"fake",\r
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"\r
-        },\r
-        "nova_object.name":"InstanceActionPayload",\r
-        "nova_object.namespace":"nova",\r
-        "nova_object.version":"1.0"\r
-    },\r
-    "priority":"INFO",\r
-    "publisher_id":"nova-compute:compute"\r
-}\r
+            "os_type":null,
+            "progress":0,
+            "ramdisk_id":"",
+            "reservation_id":"r-npxv0e40",
+            "state":"shelved_offloaded",
+            "task_state":null,
+            "power_state":"running",
+            "tenant_id":"6f70656e737461636b20342065766572",
+            "terminated_at":null,
+            "flavor": {
+                "nova_object.name": "FlavorPayload",
+                "nova_object.data": {
+                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
+                    "root_gb": 1,
+                    "vcpus": 1,
+                    "ephemeral_gb": 0,
+                    "memory_mb": 512
+                },
+                "nova_object.version": "1.0",
+                "nova_object.namespace": "nova"
+            },
+            "user_id":"fake",
+            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"
+        },
+        "nova_object.name":"InstanceActionPayload",
+        "nova_object.namespace":"nova",
+        "nova_object.version":"1.0"
+    },
+    "priority":"INFO",
+    "publisher_id":"nova-compute:compute"
+}

diff --git a/doc/notification_samples/instance-shelve_offload-start.json b/doc/notification_samples/instance-shelve_offload-start.json
index 6bfad137da066b3d96c839ce10fad84430b4a28a..56f740f9ba47f1b7216541d992b4888a6f0713e3 100644 (file)
--- a/doc/notification_samples/instance-shelve_offload-start.json
+++ b/doc/notification_samples/instance-shelve_offload-start.json
@@ -1,62 +1,62 @@
-{\r
-    "event_type":"instance.shelve_offload.start",\r
-    "payload":{\r
-        "nova_object.data":{\r
-            "architecture":"x86_64",\r
-            "availability_zone":null,\r
-            "created_at":"2012-10-29T13:42:11Z",\r
-            "deleted_at":null,\r
-            "display_name":"some-server",\r
-            "fault":null,\r
-            "host":"compute",\r
-            "host_name":"some-server",\r
-            "ip_addresses": [{\r
-                "nova_object.name": "IpPayload",\r
-                "nova_object.namespace": "nova",\r
-                "nova_object.version": "1.0",\r
-                "nova_object.data": {\r
-                    "mac": "fa:16:3e:4c:2c:30",\r
-                    "address": "192.168.1.3",\r
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",\r
-                    "meta": {},\r
-                    "version": 4,\r
-                    "label": "private-network",\r
-                    "device_name": "tapce531f90-19"\r
-                }\r
-            }],\r
-            "kernel_id":"",\r
-            "launched_at":"2012-10-29T13:42:11Z",\r
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",\r
-            "metadata":{},\r
-            "node":"fake-mini",\r
-            "os_type":null,\r
-            "progress":0,\r
-            "ramdisk_id":"",\r
-            "reservation_id":"r-npxv0e40",\r
-            "state":"shelved",\r
-            "task_state":"shelving_offloading",\r
-            "power_state":"running",\r
-            "tenant_id":"6f70656e737461636b20342065766572",\r
-            "terminated_at":null,\r
-            "flavor": {\r
-                "nova_object.name": "FlavorPayload",\r
-                "nova_object.data": {\r
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",\r
-                    "root_gb": 1,\r
-                    "vcpus": 1,\r
-                    "ephemeral_gb": 0,\r
-                    "memory_mb": 512\r
-                },\r
-                "nova_object.version": "1.0",\r
-                "nova_object.namespace": "nova"\r
-            },\r
-            "user_id":"fake",\r
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"\r
-        },\r
-        "nova_object.name":"InstanceActionPayload",\r
-        "nova_object.namespace":"nova",\r
-        "nova_object.version":"1.0"\r
-    },\r
-    "priority":"INFO",\r
-    "publisher_id":"nova-compute:compute"\r
-}\r
+{
+    "event_type":"instance.shelve_offload.start",
+    "payload":{
+        "nova_object.data":{
+            "architecture":"x86_64",
+            "availability_zone":null,
+            "created_at":"2012-10-29T13:42:11Z",
+            "deleted_at":null,
+            "display_name":"some-server",
+            "fault":null,
+            "host":"compute",
+            "host_name":"some-server",
+            "ip_addresses": [{
+                "nova_object.name": "IpPayload",
+                "nova_object.namespace": "nova",
+                "nova_object.version": "1.0",
+                "nova_object.data": {
+                    "mac": "fa:16:3e:4c:2c:30",
+                    "address": "192.168.1.3",
+                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
+                    "meta": {},
+                    "version": 4,
+                    "label": "private-network",
+                    "device_name": "tapce531f90-19"
+                }
+            }],
+            "kernel_id":"",
+            "launched_at":"2012-10-29T13:42:11Z",
+            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "metadata":{},
+            "node":"fake-mini",
+            "os_type":null,
+            "progress":0,
+            "ramdisk_id":"",
+            "reservation_id":"r-npxv0e40",
+            "state":"shelved",
+            "task_state":"shelving_offloading",
+            "power_state":"running",
+            "tenant_id":"6f70656e737461636b20342065766572",
+            "terminated_at":null,
+            "flavor": {
+                "nova_object.name": "FlavorPayload",
+                "nova_object.data": {
+                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
+                    "root_gb": 1,
+                    "vcpus": 1,
+                    "ephemeral_gb": 0,
+                    "memory_mb": 512
+                },
+                "nova_object.version": "1.0",
+                "nova_object.namespace": "nova"
+            },
+            "user_id":"fake",
+            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"
+        },
+        "nova_object.name":"InstanceActionPayload",
+        "nova_object.namespace":"nova",
+        "nova_object.version":"1.0"
+    },
+    "priority":"INFO",
+    "publisher_id":"nova-compute:compute"
+}