Andrzej Cichocki
e3086122a8
Merge commit '3abe6888cfd867b7edd398a2f8e80b1d470c7936' into andr3ej-typo-merge
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
2018-02-27 17:14:20 +00:00
Andrzej Cichocki
4d4253a287
CORDA-1124 Fix thread leak in generateAndSaveNodeInfo ( #2659 )
2018-02-27 15:43:41 +00:00
Christian Sailer
0ff37c0437
CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks ( #2661 )
...
* CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks
* CORDA-1122 Codereview: Add comment for extra commit to rollback and add better message sequence logging to tricky test
2018-02-27 15:25:58 +00:00
Maksymilian Pawlak
4695cb0810
Allows DemoBench profile files to utilize extra database settings ( #2310 )
...
Pass-through for supporting external DB properites in .profile files
2018-02-27 15:15:46 +00:00
Thomas Schroeter
40727f3bdd
Update documentation of Postgres support
2018-02-27 14:44:17 +00:00
Katelyn Baker
ce4392ef31
CORDA-1080 - Doc update to make instructions clearer ( #2599 )
2018-02-27 14:09:45 +00:00
Joel Dudley
0c62c6d850
Improves CorDapp build instructions by including other ext versions, and clearly pointing to the templates as a guide.
2018-02-27 12:48:08 +00:00
Andrzej Cichocki
3abe6888cf
Fix typo. ( #2657 )
2018-02-27 12:36:44 +00:00
Thomas Schroeter
c7e03633c7
Merge remote-tracking branch 'open-source/master' into thomas-merge
2018-02-27 12:01:49 +00:00
Andras Slemmer
48da1c3ebf
Merge pull request #2653 from corda/aslemmer-fix-rpc-server-sender
...
Fix rpc sender thread busy looping
2018-02-27 11:49:21 +00:00
Maksymilian Pawlak
854a40d87f
[Corda-1116] Classpath as env ( #2652 )
...
* Move classpath to a system variable so it can overcome command limits on Windows, while keep working fine on other system.
2018-02-27 11:48:25 +00:00
Maksymilian Pawlak
3066926f0f
Improved classloader closing ( #2650 )
...
* Better handling of classloader closing
2018-02-27 11:15:23 +00:00
Andras Slemmer
cd569577d2
Fix rpc sender thread busy looping
2018-02-27 10:23:48 +00:00
Andrzej Cichocki
3391810101
CORDA-1004 Quasar-friendly ThreadLocal solution ( #2594 )
...
* Use FastThreadLocalThread in fiber scheduler
* Test that thread locals aren't serialized
2018-02-27 10:22:30 +00:00
Joel Dudley
f7c9f0d10e
Wrong file name.
2018-02-27 10:21:03 +00:00
Thomas Schroeter
147f46fbf4
[CORDA-1119] Sign in DB transaction ( #2645 )
2018-02-27 10:00:30 +00:00
Andrius Dagys
0adc203d7a
CORDA-696: Fix conflict resolution error, fix filename type
2018-02-27 09:48:39 +00:00
Andrius Dagys
d425a10c2b
Merge pull request #486 from corda/andrius-merge-02-26
...
Merge CORDA-1096, CORDA-696, CORDA-877
2018-02-27 09:22:16 +00:00
Andrius Dagys
59a6ced423
CORDA-696: Fix incorrect merge conflict resolution, fix filename typo
2018-02-26 18:48:20 +00:00
Andrius Dagys
9814ea6f34
Merge branch 'master' into andrius-merge-02-26
2018-02-26 18:41:20 +00:00
Joel Dudley
3c8db47b5a
Updates shell example of starting flow to reflect cash API change.
2018-02-26 18:16:25 +00:00
Chris Rankin
9da3a8ee05
[ENT-1552] Delete temporary truststore once the test is complete. ( #484 ) ( #2634 )
2018-02-26 17:11:10 +00:00
Joel Dudley
f1c3f584ac
Showcase link in Quickstart guide. Remove Utilities link (merged with Samples).
2018-02-26 16:47:53 +00:00
Rick Parker
2da28c574e
CORDA-1040 docs for FlowLogic.sleep ( #2625 )
2018-02-26 16:07:40 +00:00
Maksymilian Pawlak
b91ef43e0f
Remove the debug helper which should never make it into master ( #2633 )
...
* Remove IRS Docker demo helpers
2018-02-26 15:47:04 +00:00
Maksymilian Pawlak
cc84b34dca
Close classloader to release associated file ( #2635 )
...
[CORDA-1113] Close classloader to release associated file
2018-02-26 15:01:57 +00:00
Joel Dudley
7517270dde
Improves node.conf page. Shows the defaults used.
2018-02-26 14:53:13 +00:00
Chris Rankin
26c388003c
[ENT-1552] Delete temporary truststore once the test is complete. ( #484 )
2018-02-26 12:46:47 +00:00
cburlinchon
60c44a0358
CORDA-998 Add suspend and resume functionality to Node ( #461 )
...
* Add suspend and resume functionality to Node to stop minimum number of services(P2PMessaging, RPCMessaging, NodeScheduler, StateMachine and BridgeManager)
2018-02-26 11:56:02 +00:00
Andrius Dagys
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
Andrius Dagys
0edfef2409
CORDA-696 - Create separate transaction types for contract upgrade transactions ( #2589 )
...
* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467 )
* CORDA-696: Create separate transaction types for contract upgrade transactions.
Add rationale around upgrade transactions
Move contract upgrade transaction resolution logic into internal until it's stabilised.
Throw a better exception when contract attachment not found
Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging
Introduce a new upgraded contract interface that allows specifying the legacy constraint.
Remove StateLoader, make all tx resolution functions take in ServicesForResolution
Contract upgrade transactions can handle whitelist by zone constraints
When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.
CORDA-696: Update upgrade docs
2018-02-26 11:29:25 +00:00
Christian Sailer
a483e7e8ce
CORDA-1096 - Performance when loading multiple states from the vault ( #2614 )
...
* CORDA-1096 - Performance when loading multiple states from the vault (#2609 )
* Provide efficient `loadStates()` implementation
* Replace loops using `loadState` with calls to `loadStates`
* Replace `map`/`flatMap` with just a single `flatMap`
2018-02-26 09:37:32 +00:00
Ben Abineri
908a614888
Merge pull request #483 from corda/merges/february-23-15-30
...
Merges/february 23 15 30
2018-02-26 09:33:16 +00:00
sollecitom
d7b7dc4925
Merge branch 'master' into merges/february-23-15-30
2018-02-26 09:30:43 +00:00
Michele Sollecito
7828e658ac
Revert "Merges - 23rd February 2018 at 15:30 ( #479 )" ( #482 )
...
This reverts commit 2f60ff44a6
.
2018-02-26 09:28:56 +00:00
Joel Dudley
50ccb32700
Adds a 'provision the certificates' step to the Windows deployment instructions.
2018-02-26 09:21:27 +00:00
Maksymilian Pawlak
1bca591dd1
Disable unit test for experimental projects ( #2627 )
...
* Disable unit test for experimental projects
2018-02-23 20:48:39 +00:00
igor nitto
fd491d91ff
WebServer init failure on config produced by plugins >= 4.0.2 [CORDA-877] ( #2624 )
2018-02-23 18:29:49 +00:00
Michele Sollecito
2f60ff44a6
Merges - 23rd February 2018 at 15:30 ( #479 )
2018-02-23 17:53:15 +00:00
Thomas Schroeter
d3dcbfb6c3
Fix path of main class ( #478 )
2018-02-23 17:05:05 +00:00
sollecitom
11a484eb03
Fixed notary healthchecker cordformation.
2018-02-23 16:39:36 +00:00
sollecitom
e78e65bd01
refreshed api-current.txt
2018-02-23 16:19:13 +00:00
sollecitom
3d4e24a364
Patched doorman network parameters with empty list for now, and added a TODO.
2018-02-23 16:01:49 +00:00
sollecitom
d41b9a0299
merged OS into master
2018-02-23 15:47:07 +00:00
Michele Sollecito
191f412aba
Fixed flows draining mode after regression introduced by OS -> ENT merge ( #474 )
2018-02-23 15:19:37 +00:00
Michele Sollecito
5be0e4b39e
[CORDA-941]: Add NetworkParameters contract implementation whitelist. ( #2580 )
2018-02-23 14:29:02 +00:00
Shams Asari
977836f4eb
Enable tests which were ignored due to recent flakiness on TC and issue with maxTransactionSize which should now be resolved. ( #2621 )
2018-02-23 13:45:18 +00:00
Patrick Kuo
1552e992e7
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #2620 )
...
* ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431 )
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
(cherry picked from commit 94f7392
)
* remove R3 corda code
2018-02-23 13:38:09 +00:00
Andras Slemmer
089916d350
Merge pull request #466 from corda/aslemmer-merge-19-Feb
...
Aslemmer merge 19 feb
2018-02-23 13:20:07 +00:00
Andrzej Cichocki
c8672d373f
CORDA-973 Compression support for serialization ( #2473 )
...
* Serialization magic is now 7 bytes
* Introduce encoding property and whitelist
2018-02-23 13:07:51 +00:00