Commit Graph

7 Commits

Author SHA1 Message Date
josecoll
24bf6df868 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 09:58:51 +00:00
Shams Asari
b1509607cb Updating network-management to use DigitalSignatureWithCert, network map certs and other relevant changes from O/S. 2018-01-15 15:23:07 +00:00
josecoll
120500646c Minor reverts requested by Shams. 2018-01-15 11:54:24 +00:00
josecoll
729aa65e7f Merge from R3 Corda 3.0 Dev Preview release branch to master 2018-01-13 11:00:01 +00:00
Michal Kit
4caf6d92ea
ENT-1350 unifying the config-file command line argument (#333)
* ENT-1350 unifying the config-file command line argument

* Changing README.md
2018-01-10 16:27:59 +00:00
Michal Kit
a83f4fd61b
Changing network parameters to use node info files instead of by hand… (#288)
* Changing network parameters to use node info files instead of by hand specification of notary

* Addressing review comments

* Different names for notaries

* Updating README
2018-01-05 15:10:34 +00:00
Shams Asari
2a0eefd351
Doorman generates trust store file, containing the root cert, instead of the .pem file (#241) 2017-12-21 13:54:10 +00:00