9 Commits

Author SHA1 Message Date
szymonsztuka
a0b632f964 Merge OS -> ENT: added deduplicationId to execute method in classes overriding FlowAsyncOperation 2018-10-22 09:19:28 +01:00
Chris Rankin
430c4bcf83 Merge commit '47068e6b7ad0afb3ed8df61a429470f19331b7b5' into chrisr3-os-merf
Conflicts:
	docs/source/index.rst
	finance/build.gradle
	finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
	node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
	samples/simm-valuation-demo/build.gradle
2018-10-16 12:07:55 +01:00
Andrius Dagys
504cefc6f6 CORDA-535: Move MySQL notary into a separate module 2018-10-10 16:07:16 +01:00
Shams Asari
11e2bef240
ENT-2473: Removed copyright headers (#1364) 2018-09-03 16:38:52 +01:00
Christian Sailer
fa51dd35d4 Comment out Cordform for tools/notarytest. This needs to be converted to groovy/gradle (see https://r3-cev.atlassian.net/browse/ENT-2460) 2018-08-28 13:59:16 +01:00
Katelyn Baker
1fda42c2de Fixing post merge issues with reference states 2018-07-30 11:37:58 +01:00
Shams Asari
0c8c914882 Removing warnings 2018-07-05 15:45:28 +01:00
Andrius Dagys
5959b13e23
Minor: notary test tool cleanup (#863) 2018-05-21 17:36:17 +02:00
Andrius Dagys
1c575b5364
Tool for prototyping and load testing notary implementations (#823) 2018-05-17 20:02:19 +01:00