a7e4993567
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180605-2
2018-06-05 20:10:20 +01:00
7e3e94cee9
OS -> ENT merge ( #928 )
...
* Revert back logging of tests (#3305 )
* ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. (#3306 )
2018-06-05 19:53:07 +01:00
f4621d9a74
[CORDA-1297] Column nullability in migrations ( #916 )
...
* Migrations to proper nullability
* Removed node-core.changelog-v3-GA.xml file as indicated by PR comments, This change was already provided by nullability upgrade commits
2018-06-05 18:13:49 +01:00
e2a2c2d20d
ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. ( #3306 )
2018-06-05 17:38:55 +01:00
b0f5b81d26
Merge pull request #926 from corda/mnesbit-merge-20180605
...
ENT-2027: Merge from open source
2018-06-05 16:05:09 +01:00
baa73ab141
Revert back logging of tests ( #3305 )
2018-06-05 15:58:38 +01:00
c2f22e18a5
Corda Behave framework updates to decouple from Network Services ( #914 )
...
* Added new 'eventHorizonDays' configuration item.
* Added custom authenticator to provide ARTIFACTORY credentials upon resolving protected internal URL.
* Re-pointed functional test scenarios to point to Enterprise master.
* Enterprise corda network scenarios to use NetworkBootstrapper tool (instead of Doorman/NMS) since decision made by Product Management to split out Doorman/NMS from Enterprise.
* Configuration parameter changed to 'runMigration' since DP3.
* Fixed problem with logger upon startup.
* General improvements and additions to setup and execution scripts (eg. SIMM valuation demo now consists of 3 separate jars)
* Updates to decouple from Network Services.
* Download all JARs from artifactory for a given published distribution.
* Add TODOs for Doorman/NMS rework.
* Addressing TL PR review comments.
* Additional instructions for setting up the environment and running QA tests.
* Fixed repository URL references.
2018-06-05 15:02:07 +01:00
4882e2e089
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605
2018-06-05 13:37:35 +01:00
0812329aaf
The logic in my recent late start bridge PR was wrong. This doesn't affect embedded bridges, but for external bridges the state doesn't reset correctly on bridge restart. ( #3301 )
2018-06-05 13:30:20 +01:00
086b9daa6e
Updates the setup instructions to be IntelliJ 2018 compatibile. ( #3299 )
2018-06-05 10:57:29 +01:00
010c30f6d4
DOCS - Remove references to webAddress since it's no longer a valid option ( #3293 )
2018-06-05 10:57:19 +01:00
ee5851b56a
Update CONTRIBUTORS.md
2018-06-05 10:43:17 +01:00
d86ae5fc0b
I set the max retry time for AMQP at 5 minutes. This is just too long for any kind of sensible testing, so drop back to 1 minute. ( #3294 )
2018-06-05 10:30:35 +01:00
4de4e8a3ef
Merge pull request #923 from corda/merges/june-05-09-57
...
Merges June 05 at 09:57
2018-06-05 10:17:45 +01:00
7bf6608c8e
Fixes webport numbers based on recent build.gradle changes. ( #3298 )
2018-06-05 10:15:47 +01:00
61127fe65f
Merge remote-tracking branch 'remotes/open/master' into merges/june-05-09-57
2018-06-05 09:58:28 +01:00
e34bce9f3f
[CORDA-1582]: Shell is back to logging only useful information. ( #3296 )
2018-06-05 09:25:47 +01:00
ff8471341f
Removes Log4J from Core. Readds to shell where required. ( #3257 )
...
* Removes Log4J dependency from `core`.
* Adds dependency on Log4J directly to shell. Missing colons.
2018-06-04 23:24:36 +01:00
d989ae9dcc
Stray backtick.
2018-06-04 23:20:26 +01:00
993737aecc
Merge pull request #919 from corda/merges/os-2018-06-04-szymon
...
OS -> ENT merge on 2018-06-04
2018-06-04 22:16:26 +01:00
644f1c6d2f
ENT-1983: throw more specific exception when starting a flow as a result
...
of P2P messaging and SMM is stopped.
2018-06-04 19:03:36 +01:00
da22c2511d
Table name node_attchments_contracts change in SQL setup scritps following fix for CORDA-1499 merged from OS.
2018-06-04 19:00:38 +01:00
703f0cc86f
Liquibase script for a table name node_attchments_contracts change following fix for CORDA-1499 merged from OS.
2018-06-04 17:53:01 +01:00
f5c9a398ad
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon
...
# Conflicts:
# docs/source/upgrade-notes.rst
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
2018-06-04 17:35:19 +01:00
4f1a22dfac
Merge pull request #910 from corda/tudor-merge-os-01_06
...
Tudor merge os 01 06
2018-06-04 15:37:33 +01:00
3b65ca2ab6
Temporary ignore flaky Test to unblock merge
2018-06-04 14:13:59 +01:00
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
