szymonsztuka
fd19338f62
Merge OS -> ENT:
...
NodeStartup - added back Enterprise only serialization case for Oracle database in NodeStartup,
added deduplicationId to execute method in classes overriding FlowAsyncOperation
2018-10-21 22:05:12 +01:00
rick.parker
c16dbfd82b
Compilation error fix.
2018-10-19 11:47:52 +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
Thomas Schroeter
70e24b79fb
Thomas/ent 2510 single column index ( #1431 )
2018-10-12 15:11:10 +01:00
Andrius Dagys
504cefc6f6
CORDA-535: Move MySQL notary into a separate module
2018-10-10 16:07:16 +01:00
