From 36392a25d80e0d31f024c13f462e20d7a3405543 Mon Sep 17 00:00:00 2001
From: pwalczysko
Date: Wed, 6 Sep 2023 11:47:37 +0100
Subject: [PATCH 1/3] Modify the demo text, remove links, fix typos
---
omero/ome-demoserver.yml | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/omero/ome-demoserver.yml b/omero/ome-demoserver.yml
index ea506174..8516bae5 100644
--- a/omero/ome-demoserver.yml
+++ b/omero/ome-demoserver.yml
@@ -377,20 +377,16 @@
password: {password}\n\n
Use these login details as follows\n
1. In your browser, go to demo.openmicroscopy.org and log in.\n
- 2. Download the OMERO.insight [1] desktop application to im
- port your first data into OMERO.\n
- 3. Following the steps in the omero-guide [2], change the server ad
- dress to\n
- demo.openmicroscopy.org and connect\n
- using the login details as above to import your data.\n
- 4. Use the walkthrough example [3] to get ideas about ho
- w to start using OMERO.\n
+ 2. Download the OMERO.insight [1] desktop application to import\n
+ your first data into OMERO.\n
+ 3. Once OMERO.insight is started, following the steps in the\n omero-guide [1], change the server address to\n
+ demo.openmicroscopy.org\n
+ and connect using the login details as above to import your data.\n
+ 4. Use the walkthrough example [1] to get further ideas about how
+ to start using OMERO.\n
OME Team\n\n
- [1] https://omero-guides.readthedocs.io/en/latest\
- /upload/docs/import-desktop-client.html \n
- [2] https://omero-guides.readthedocs.io/en/latest/upload/\
- docs/import-desktop-client.html#step-by-step \n
- [3] https://omero-guides.readthedocs.io/en/latest/example.html \n'
+ [1] In your browser, go to omero-guides.readthedocs.io/en/latest
+ and click on "OMERO walkthrough example" under "Getting started".
postgresql_version: "11"
filesystem: "xfs"
From 5d49d3d1a3e892142b20320ac6ff0c60734ef181 Mon Sep 17 00:00:00 2001
From: pwalczysko
Date: Wed, 6 Sep 2023 12:55:29 +0100
Subject: [PATCH 2/3] Remove the double-quotes and return the single quote to
finish the block
---
omero/ome-demoserver.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/omero/ome-demoserver.yml b/omero/ome-demoserver.yml
index 8516bae5..99fc6085 100644
--- a/omero/ome-demoserver.yml
+++ b/omero/ome-demoserver.yml
@@ -386,7 +386,7 @@
to start using OMERO.\n
OME Team\n\n
[1] In your browser, go to omero-guides.readthedocs.io/en/latest
- and click on "OMERO walkthrough example" under "Getting started".
+ and click on OMERO walkthrough example under Getting started.'
postgresql_version: "11"
filesystem: "xfs"
From f85887604c9d823ca94babee5d9f5f8d92f2fe9c Mon Sep 17 00:00:00 2001
From: pwalczysko
Date: Wed, 1 Nov 2023 10:16:39 +0000
Subject: [PATCH 3/3] Bump prometheus exporter version aka
https://github.com/IDR/deployment/pull/412/files
---
requirements.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.yml b/requirements.yml
index 36cd3b78..a1759a69 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -44,7 +44,7 @@
version: 1.2.0
- name: ome.omero_prometheus_exporter
- version: 0.3.3
+ version: 0.3.6
- name: ome.omero_server
version: 4.0.2