SEBA-389 Prevent model name collision
Change-Id: Ice19a662d50ec0cd636dfd6d9b92b7e75cc11ee9
diff --git a/VERSION b/VERSION
index 45a1b3f..781dcb0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.2
+1.1.3
diff --git a/xos/synchronizer/models/simpleexampleservice.xproto b/xos/synchronizer/models/simpleexampleservice.xproto
index b5d37a1..c3fdba7 100644
--- a/xos/synchronizer/models/simpleexampleservice.xproto
+++ b/xos/synchronizer/models/simpleexampleservice.xproto
@@ -13,11 +13,14 @@
required string html_code = 2 [help_text = "Code for this color", db_index = False, max_length = 256, null = False, blank = False];
}
-message ServiceInstanceWithCompute (ServiceInstance) {
+// Note: Named ServiceInstanceWithCompute2 to prevent name collision with ExampleService.ServiceInstanceWithCompute.
+// Expect this model to eventually move to the core.
+
+message ServiceInstanceWithCompute2 (ServiceInstance) {
optional manytoone compute_instance->ComputeServiceInstance:service_instance_with_computes = 1:1001 [db_index=True, null=True, blank=True];
}
-message SimpleExampleServiceInstance (ServiceInstanceWithCompute){
+message SimpleExampleServiceInstance (ServiceInstanceWithCompute2){
option verbose_name = "Example Service Instance";
required string tenant_message = 1 [help_text = "Tenant Message to Display", max_length = 254, null = False, db_index = False, blank = False];
optional manytoone foreground_color->ColorNew:serviceinstance_foreground_colors = 2:1001 [db_index = True, null = True, blank = True];