Resolved merge conflicts again

This commit is contained in:
muawiakh 2018-02-08 15:57:37 +01:00
commit 320e09dee3

View File

@ -13,7 +13,7 @@ You can modify them to suit your needs.
.. _register-a-domain-and-get-an-ssl-certificate-for-it:
1. Register a Domain and Get an SSL Certificate for It
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The BigchainDB APIs (HTTP API and WebSocket API) should be served using TLS,
so the organization running the cluster
@ -25,7 +25,7 @@ and buy an SSL/TLS certificate for the FQDN.
.. _generate-the-blockchain-id-and-genesis-time:
2. Generate the Blockchain ID and Genesis Time
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Tendermint nodes require two parameters that need to be common and shared between all the
participants in the network.
@ -132,10 +132,10 @@ Otherwise, your organization must
"mdb-mon-instance-4"
],
"Tendermint": [
"tendermint-instance-1",
"tendermint-instance-2",
"tendermint-instance-3",
"tendermint-instance-4"
"tm-instance-1",
"tm-instance-2",
"tm-instance-3",
"tm-instance-4"
]
}