josecoll
70681cdcc7
Comment out unused code for now (uncompilable due to breaking open source code change)
2017-11-18 11:43:26 +00:00
Christian Sailer
8b55f415bd
Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106
2017-11-06 17:37:30 +00:00
Christian Sailer
8549a77a76
Use system tmp dir instead of hardcoding unix path
2017-10-13 16:31:44 +01:00
sollecitom
3f5561db1e
Fixed Enclavelet
2017-09-27 15:05:18 +01:00
sollecitom
85bc0a38a2
Trying to fix EnclaveletTest.kt
...
Trying to fix EnclaveletTest.kt
Trying to fix EnclaveletTest.kt
Trying to fix EnclaveletTest.kt
EnclaveletTest passes.
Restored incorrectly removed function in TransactionDSLInterpreter.
Fixed NativeSgxApiTest
2017-09-27 12:04:18 +01:00
sollecitom
9284e731c0
Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
# settings.gradle
2017-09-26 18:08:47 +01:00
Andras Slemmer
c9e9242ff4
Merge remote-tracking branch 'open/master' into aslemmer-enterprise-merge-september-8
2017-09-08 11:14:40 +01:00
Chris Rankin
337e320275
Ensure that corda-enclavelet.jar is executable and works. ( #33 )
2017-09-06 17:32:08 +01:00
Andras Slemmer
a4ba8e4f2f
Merge open master
2017-08-30 11:41:30 +01:00
Chris Rankin
e79da0ebae
Ensure that the serialisation scheme is initialised as soon as the class is loaded. ( #27 )
2017-08-21 11:12:59 +01:00
Michal Kit
890ef68523
Fixes after rebase
2017-08-15 17:41:35 +01:00
Chris Rankin
3ae53683ea
Register Kryo serializer for use inside the SGX enclave. ( #23 )
2017-08-15 12:05:32 +01:00
Michal Kit
b6fd5ede58
Merge community-master
2017-08-15 12:04:09 +01:00
Mike Hearn
291049f66e
Fixup after merge
2017-08-01 16:13:37 +02:00
Andras Slemmer
eac7db295c
Merge remote-tracking branch 'open/master' into aslemmer-enterprise-merge-july-13
2017-07-13 12:35:20 +01:00
Andras Slemmer
4f85026dfc
Merge remote-tracking branch 'open/master'
2017-06-27 14:45:30 +01:00
Mike Hearn
ca8f5050cf
Merge branch 'master' into mike-enterprise-merge-june-20th
2017-06-21 19:49:33 +02:00
Andrius Dagys
376a9d399f
Merge remote-tracking branch 'open/master'
2017-05-24 12:19:49 +01:00
Andrius Dagys
550be76787
Fix post-merge issues:
...
- Update Doorman to reflect the X500 naming and configuration changes
- Minor other changes
2017-05-11 17:56:32 +01:00
Andras Slemmer
528c9efe9d
Add sgx build, documentation, verify-enclave
2017-03-24 18:23:04 +00:00
