sollecitom
|
e3b2d3332d
|
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
# Conflicts:
# constants.properties
# node-api/src/main/kotlin/net/corda/nodeapi/exceptions/RejectedCommandException.kt
# node/src/main/kotlin/net/corda/node/internal/RpcAuthorisationProxy.kt
# node/src/main/kotlin/net/corda/node/internal/SecureCordaRPCOps.kt
|
2018-05-21 17:29:26 +01:00 |
|
Michele Sollecito
|
f0db76d854
|
Re-enabled commented out test and fixed warnings in Finance. (#3206)
|
2018-05-21 17:00:30 +01:00 |
|
sollecitom
|
9a69a36904
|
Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21
# Conflicts:
# .idea/compiler.xml
# constants.properties
# experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
# experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
# experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
# node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
|
2018-05-14 15:56:43 +01:00 |
|
Michele Sollecito
|
d027b5b8f2
|
[CORDA-1472]: Crackdown on warnings. (#3136)
|
2018-05-14 21:15:52 +07:00 |
|
Chris Rankin
|
e135cf062c
|
Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge
|
2018-04-24 18:09:41 +01:00 |
|
Chris Rankin
|
8e507d0b88
|
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. (#2992)
|
2018-04-24 14:03:41 +01:00 |
|
Shams Asari
|
a97abbc8c0
|
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
|
2018-04-05 17:23:03 +01:00 |
|
Shams Asari
|
1b37cef822
|
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash (#2931)
|
2018-04-05 17:18:27 +01:00 |
|
Michele Sollecito
|
da1afd9c55
|
Introduced copyright in all source files. (#519)
|
2018-03-06 17:29:21 +00:00 |
|
cburlinchon
|
311475a81c
|
Switch to using our own quasar fork with thread leak fix (#2443)
* Switch to using our own quasar fork with thread leak fix
* Update quasar.jar in lib
* Review changes
* Bump to 3.0.7
|
2018-02-14 17:32:00 +00:00 |
|
Andras Slemmer
|
b354d335a3
|
Remove extra blank line
|
2017-10-11 10:35:11 +01:00 |
|
Andras Slemmer
|
c56c9fd455
|
Add README.md, some docs
|
2017-10-11 10:06:27 +01:00 |
|
Andras Slemmer
|
16b26970a9
|
Add kryo-hook javaagent
|
2017-10-11 09:54:19 +01:00 |
|