Michele Sollecito 11c7c879eb Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05 ...

# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt

2018-11-08 16:39:09 +00:00

..

blobinspector

CORDA-1838: Add subcommands to node (#4091)

2018-10-24 13:58:19 +01:00

bootstrapper

Ignoring invalid test (works on Linux not on Windows) (#4173)

2018-11-06 17:31:11 +00:00

cliutils

ENT-2695 Restore async logging (#4195)

2018-11-08 14:33:45 +00:00

consensus-benchmark

A first iteration benchmark tool for consensus protocols. It lets you generate load

2018-10-12 14:25:36 +01:00

dbmigration

ENT-2534: Seperate database manager into commands (#1527)

2018-11-05 14:32:51 +00:00

demobench

Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05

2018-11-08 16:39:09 +00:00

explorer

Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-2018-10-30

2018-10-30 14:10:01 +00:00

graphs

ENT-2473: Removed copyright headers (#1364)

2018-09-03 16:38:52 +01:00

jmeter

Ent-1839 Performance Test Suite (#1501)

2018-10-26 18:29:40 +01:00

loadtest

Assorted set of clean ups (#4039)

2018-10-05 18:05:10 +01:00

network-bootstrapper

[CORDA-1993]: Replace reflection-based NodeConfiguration parsing with versioned property-based parsing mechanism. (#4132)

2018-11-08 15:56:00 +00:00

notary-healthcheck

ENT-2682 Fix cordapp layout for notaryhealthcheck (#1528)

2018-11-02 15:39:14 +00:00

notarytest

ENT-1858: All non-bft notary services are now async

2018-11-02 11:12:46 +00:00

scripts

Improve the upgrade-test-packages.sh script to work on macOS. Fixes an issue found by tom on pubslack. (#2894)

2018-03-29 10:47:48 +02:00

shell

Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a

2018-11-07 18:17:29 +00:00

shell-cli

CORDA-1838: Add subcommands to node (#4091)

2018-10-24 13:58:19 +01:00