18a6e2fa2a
CORDA-1477 backport Ent test fixes ( #3292 )
2018-06-04 13:49:25 +01:00
141d45c39d
Add simulation of the avalanche consensus protocol to experimental ( #3283 )
2018-06-04 13:33:34 +01:00
29da4b02a6
Fix tests
2018-06-04 11:58:41 +01:00
3e5b409af4
DEVOPS-663 Test file for overnight run ( #913 )
...
* Update name of simple notary
* Fix notary name
2018-06-04 11:29:34 +01:00
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
7350cd9d1e
[CORDA-1408]: Fixed some Demobench bugs. ( #3288 )
2018-06-04 09:35:38 +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
0ecacb894e
Fix merge
2018-06-01 17:14:27 +01:00
fc020bca4b
[CORDA-1575]: Out of process nodes started by the driver do not log to file (fix). ( #3286 )
2018-06-01 16:16:23 +01:00
57d379597b
Fix a typo in node_attchments_contracts table name. ( #3202 )
2018-06-01 16:08:19 +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
48de90ac77
Fix merge
2018-06-01 14:36:38 +01:00
6dc778e404
Fix merge
2018-06-01 14:28:23 +01:00
b7fbebb490
Cleaned up blob inspector doc ( #3284 )
2018-06-01 14:26:58 +01:00
eb801d40b8
Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
# core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.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/internal/cordapp/CordappLoader.kt
2018-06-01 13:56:43 +01:00
9efb1ecfe0
CORDA-1477 add check for code version in checkpoints ( #3256 )
...
* CORDA-1477 add check for code version in checkpoints
* CORDA-1477 Comment style
* CORDA-1477 address code review comments
* CORDA-1477 add changelog entry
* CORDA-1477 attempt to fix tests
* CORDA-1477 attempt to fix tests and address code review comments
* CORDA-1477 attempt to fix tests
2018-06-01 13:37:39 +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
bd3280a06a
Update CONTRIBUTORS.md
2018-06-01 12:06:36 +01:00
4bc9151d5d
Limit concurrency of the bootstrapper ( #3271 )
2018-06-01 11:55:46 +01:00
3eb1ba9faa
review comments
2018-06-01 11:50:30 +01:00
aafa548454
Update CONTRIBUTORS.md
2018-06-01 09:45:43 +01:00
edb462eb06
update azure documentation ( #2950 )
...
add yo!app deployment for Corda V2
2018-06-01 09:26:07 +01:00
c6d5307b9e
Updates readme.
2018-05-31 22:01:27 +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
