63f11d0b54
Upgrade integration test for CORDA-1356 to run in database mode ( #899 )
...
Add SQL setup to run integration test in database mode, add ordering in test because original assumption that rows are returned as inserted doesn't work in Oracle db, ensure distinct names when starting nodes (they can't clash in database mode, as the schema name is taken from node name).
2018-06-04 10:31:56 +01:00
71d8586e61
ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped … ( #912 )
...
* ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped.
* ENT-1962: update exception constructor
2018-06-04 10:14:53 +01:00
76644e0d00
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #907 )
...
* Final part of rebranding exercise.
* Fix test.
2018-06-02 10:47:31 +01:00
400e64b5ed
Merge pull request #897 from corda/kat-remove-network-services
...
REFACTOR - Removing Network Services code and docs
2018-06-01 19:05:12 +01:00
609c313496
CORDA-1564 Remove old sessions on flow retry from multi-threaded SMM ( #906 )
2018-06-01 15:38:09 +01:00
c56e4a12e9
Merge branch 'master' into kat-remove-network-services
2018-06-01 15:00:13 +01:00
39548aefe2
ENT-1888: Docs: improve rendering of the database migration document. ( #902 )
...
Docs: improve rendering of the database migration document.
2018-06-01 13:20:51 +02:00
3eb1ba9faa
review comments
2018-06-01 11:50:30 +01:00
4f6b50dd8d
Merge pull request #903 from corda/merges/may-31-19-04
...
Merges: May 31 at 19:04
2018-05-31 19:09:23 +01:00
c0ddb0b026
Merge remote-tracking branch 'remotes/open/master' into merges/may-31-19-04
...
# Conflicts:
# docs/source/network-map.rst
2018-05-31 19:06:28 +01:00
0ea46a3579
Merge pull request #901 from corda/os-merge-34a480d
...
O/S merge from 34a480d
2018-05-31 19:03:09 +01:00
52fa86079b
[CORDA-1569]: Shell doesn't yield control back to the user after a completed flow and throws NullPointerExceptions ( #3281 )
...
* [CORDA-1569]: Shell doesn't yield control back to the user after a completed flow and throws NullPointerExceptions
2018-05-31 18:50:35 +01:00
51c359c48d
CORDA-1564 Clean up old sessions when retrying flows. ( #3278 )
2018-05-31 18:43:50 +01:00
24629e5fed
Merge fix
2018-05-31 17:52:37 +01:00
1feeda7d3b
Merge remote-tracking branch 'open/master' into os-merge-34a480d
2018-05-31 17:45:06 +01:00
74fd5b9e9d
Add documentation on clearing network map cache ( #3280 )
...
Add documentation on clearing network map cache
CORDA-1562
2018-05-31 17:44:38 +01:00
34a480d7e3
Move checkPayloadIs out of the public API ( #3279 )
2018-05-31 17:40:49 +01:00
01fb1fc3a1
Merge pull request #900 from corda/mnesbit-avoid-race-condition
...
ENT-2003: Avoid a race condition in bridge on master change
2018-05-31 15:48:57 +01:00
675059bfa8
System.exit node if artemis is closed ( #898 )
2018-05-31 15:08:46 +01:00
8af17d4c3e
During testing I observed a race condition where the bridge losing master status was terminated by the dual bridge detection logic. This code defers teh m,aster claim a few seconds to prevent thsi race condition.
2018-05-31 14:32:20 +01:00
f56f07b34a
REFACTOR - Removing Network Services code and docs
2018-05-31 13:48:56 +01:00
741a5741bd
Merge pull request #896 from corda/kstreich-OS-ENT-merge-310518
...
OS->ENT merge
2018-05-31 13:24:35 +01:00
509b556807
Merge branch 'master' into kstreich-OS-ENT-merge-310518
2018-05-31 11:48:02 +01:00
63d357f62b
ENT-1986: Extend node HA test scenario to support LinearState. ( #893 )
...
* ENT-1986: Introduce new parameter `scenarioType`
* ENT-1986: Introduce `AbstractScenarioRunner` and refactor all the reusable bit of functionality into this class.
* ENT-1986: Create `LinearStateScenarioRunner` to use `perftestcordapp` flows.
* ENT-1986: More improvements to make Linear scenario runner work.
2018-05-31 11:14:59 +01:00
27e688e2c8
Merge pull request #895 from corda/os-merge-5d1cc0b
...
O/S merge from 5d1cc0b
2018-05-31 11:14:15 +01:00
c81951fbff
[CORDA-1557]: Remove "corda-" from 4.0 (and onwards) release version. ( #3275 )
2018-05-31 10:38:08 +01:00
6f30225f65
Remove redundant SessionDeliverPersistenceStrategy
2018-05-31 09:59:42 +01:00
b3b57ccb19
Dl perftest cordapp measure ( #782 )
...
* Added summary logging
* Added logging of summary metrics to performance log
* Minor arithmetic change
* Tweak
* Reformatted code
2018-05-31 09:05:26 +01:00
fd2f2eb14a
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #838 )
...
* ENT-1871 Rebrand R3Corda to Corda Enterprise
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
2018-05-31 08:59:05 +01:00
6fef4c86d3
Update configuration files to remove references to StateMachineConfiguration
2018-05-31 08:56:37 +01:00
b43e09a939
Update configuration files to remove references to StateMachineConfiguration
2018-05-31 08:52:48 +01:00
78a5c708d2
Merge fixes
2018-05-31 00:20:32 +01:00
03fae9bd7d
Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
2018-05-30 21:47:48 +01:00
294c134965
Merge pull request #894 from corda/merges/os-2018-05-30-up-to-ed70fea
...
OS -> ENT merge up to ed70fea
2018-05-30 19:06:28 +01:00
3758dbea34
CORDA-1493: add --clear-network-map-cache command line option ( #3272 )
...
CORDA-1493: add --clear-network-map-cache command
2018-05-30 18:39:27 +01:00
5d1cc0bd54
K1 is supported by TLS (permissioning.rst) and identify Sphincs as experimental due to a BC 1.58 issue which needs investigation. ( #3269 )
2018-05-30 17:38:33 +01:00
e44b6c6f4a
[CORDA-1356]: CashException is unable to derisalize with AMQP through RPC. (fix). ( #3274 )
2018-05-30 17:15:50 +01:00
ef2772e328
CORDA-1540 Remove no-longer-used StateMachineConfiguration ( #3270 )
2018-05-30 17:06:36 +01:00
953b0ca87d
Added copyrights to the test class.
2018-05-30 16:37:46 +01:00
7b09795795
CORDA-1383: Cleaned up the JSON format of WireTransaction and SignedTransaction ( #3248 )
...
In particular correctly outputs the custom state and command objects in the txs. Also fixed up deserialisation back into the transaction objects.
2018-05-30 16:37:41 +01:00
37cadbce69
Resolved merge conflicts.
2018-05-30 16:36:06 +01:00
ed70fea3a7
CORDA-1548 Hibernate session not flushed before handing over raw JDBC session to user code (e.g. coin selection) ( #3266 )
...
* Hibernate session flushed before handing over raw JDBC session to user code + test - inserting and selecting cash in the same transaction
* Additional two tests copied from Enterprise repo
2018-05-30 16:19:06 +01:00
9418f9191e
Document notary.serviceLegalName ( #3265 )
2018-05-30 15:47:40 +01:00
43ddc5e179
ENT-1396: Improve verification of states to transactions. ( #882 )
...
Since not every output state may be present, e.g. if the whole amount been paid and at source
the state is fully spent, there will not be a trace of an output state at source.
But recipient(target) will always have references of output states in its vault.
Also perform transfer of the full issued amount to eliminate any sort of coin selection issues.
2018-05-30 15:35:28 +01:00
26ef294d8d
[CORDA-1356]: OOM when using Demobench + Explorer (fix). ( #3268 )
2018-05-30 15:04:24 +01:00
1a82de8b53
Document ability to add custom dataSource properties - related to ENT-1428 ( #870 )
...
When specifying data source for NonStop database custom data source properties needs to be passed, which was always feasible but never documented (as there was no need for it).
2018-05-30 14:54:55 +01:00
9447398acb
Hot-cold operational guide fixes and improvements ( #884 )
...
* minor typos, improving the HA operational
* Hot-cold operational guide improvement(typos, styling, more specific settings)
* ENT-1959: address PR comments
* address pr comments
2018-05-30 14:12:47 +01:00
86b4086b37
Merge pull request #892 from corda/mnesbit-merge-20180530
...
Merge from OS
2018-05-30 13:39:55 +01:00
6f0363258e
[CORDA-1552]: Log commands executed by the Shell.
2018-05-30 13:28:05 +01:00
3535633d45
Add DCO requirement to contributing docs. ( #3263 )
2018-05-30 12:35:51 +01:00
