ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-19 02:25:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,326 Commits 100 Branches 407 Tags
Commit Graph

13326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michele Sollecito
81b9885f03 Fixed a compilation error. 2018-07-23 17:16:24 +01:00
Michele Sollecito
f142e491cc Fixed a compilation error. 2018-07-23 16:58:12 +01:00
Michele Sollecito
927c6ab28b Fixed a compilation error. 2018-07-23 16:53:50 +01:00
Michele Sollecito
32299a0811 Fixed a compilation error. 2018-07-23 16:48:34 +01:00
Joel Dudley
14458c6434
Update CONTRIBUTORS.md 2018-07-23 16:44:13 +01:00
josecoll
c2550d2871
Revert merge commit changes. (#3673) 2018-07-23 16:24:34 +01:00
Michele Sollecito
a4d65dae22 Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26 
# Conflicts:
#	confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
#	docs/source/changelog.rst
#	node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTSMaRtTests.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
#	node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
#	node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
#	node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
#	node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
 2018-07-23 15:22:39 +01:00
Joel Dudley
a7b1175833
Extended docs on h2settings (#3669) 
* Extended docs on h2settings

* Documents h2port being deprecated in favour of h2settings.

* Fixes link.

* Capitalisation
 2018-07-23 14:15:09 +01:00
Shams Asari
a0183fbdfd
Removed PersistentNetworkMapCache.start() (#3661) 
The loading of all node infos in the start method was unnecessary, both for the changePublisher and _loadDBSuccess, and the setting of _registrationFuture was incorrect.
 2018-07-23 14:01:14 +01:00
Matthew Layton
6a895401c5 series0ne/corda-demobench-cordapp-select (#3543) 
Adds the ability to multi-select CorDapp JARs for node profiles.
 2018-07-23 12:34:07 +01:00
Joel Dudley
2de789877a
Update CONTRIBUTORS.md 2018-07-23 12:33:56 +01:00
Michele Sollecito
94fb5a6538
Defaulting values to true for now. (#3668) 2018-07-23 12:18:28 +01:00
Joel Dudley
694f6bafbf
Updates PR checklist (#3667) 2018-07-23 11:57:36 +01:00
Joel Dudley
403a165ab6
Make it clear that must restart node after installing CorDapp. (#3666) 2018-07-23 11:37:44 +01:00
Michele Sollecito
abc1d99eaa
[CORDA-1799]: Avoid generating test CorDapp JARs from each out of process node started by the driver (#3641) 2018-07-23 11:18:11 +01:00
josecoll
e7f3847839 Merge branch 'master' of https://github.com/corda/corda 2018-07-23 11:10:19 +01:00
szymonsztuka
5db90af332
Fix integration test to run in database mode (#1289) 
Ensure ArtemisMessagingTest and  RaftTransactionCommitLogTests use H2 when running in remote database mode.
 2018-07-23 10:34:59 +01:00
Anthony Keenan
ae13fc052b
Merge pull request #1290 from corda/os-merge-20180722 
Os merge 20180722
 2018-07-23 10:24:03 +01:00
Anthony Keenan
c5e93cf5a4 Remove files not wanted in ent documentation 2018-07-23 09:06:43 +01:00
Tommy Lillehagen
6427eb3937 ENT-2296 - Fix typo in docs (#3665) 2018-07-23 08:51:52 +01:00
Anthony Keenan
168664f7a8 Merge remote-tracking branch 'open/master' into os-merge-20180722 
# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/aws-vm-explore.rst
#	docs/source/azure-vm-explore.rst
#	docs/source/corda-networks-index.rst
#	docs/source/gcp-vm.rst
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
#	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
#	finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-07-22 23:06:43 +01:00
Anthony Keenan
7853cfe003
[CORDA-1482] Make boolean config variables case insensitive (#3622) 
* Make boolean config variables case insensitive

* Address review comments
 2018-07-21 11:54:02 +01:00
Austin Moothart
624e1cbfe4
using TLS 1.2 2018-07-20 16:09:57 -04:00
Nick Arini
0c0d9b7906
Azure template guide (#1282) 
* Azure template guide and testnet docs update
 2018-07-20 16:29:10 +01:00
cxyzhang0
d2446be69e MSSQL support (#3382) 
* MSSQL support

* changes per reviewer's comments; doc

* clean up

* CONTRIBUTORS.md

* minor change in comment

* another minor change in comment

* minor formatting

* Comments formatting per recommend style; contributors in alphabet order

* more comment formatting per coding style

* Change MSSQL to SQLServer in codes and comments

* Change MSSQL to SQLServer in doc

* Use generateSequence to build repeats of ?,?,...?
 2018-07-20 16:25:15 +01:00
Nick Arini
e5d82cc9b4
Na testnet explorer docs (#3660) 
* added doc on testing deployment with node explorer
 2018-07-20 16:21:24 +01:00
Dominic Fox
b44fc94997
Merge pull request #1288 from corda/shams-fix-broken-test 
Revert "Remove non-compiling tests"
 2018-07-20 15:48:48 +01:00
Shams Asari
365c1e6ad2 Revert "Remove non-compiling tests" 
This reverts commit 935c4d2. To make the test compile two internal fields in node where made public. It seems that the "internal" modifier does not see integration tests as part of the same module.
 2018-07-20 14:34:09 +01:00
Michele Sollecito
fae30c8703
Merge pull request #1285 from corda/2018-07-19 
OS merge 2018-07-19
 2018-07-20 14:12:57 +01:00
szymonsztuka
6e91fcbb32
Enable new test to run in remote database mode - add SQL setup, add finance packages to create tables by Liquidate. (#1284) 2018-07-20 14:09:58 +01:00
Jonathan Sphar
cad684fbd3 Add Ubuntu environment setup instructions to docs/getting-set-up (#3608) 
* remove network simulator references in docs

* Added environment setup instructions for Ubuntu

* Revert "Upstream merge"

This reverts commit db4920fa6801fe9903e45f54feea8b81772fdf25, reversing
changes made to 208ac49da0caaf0dfc5ade9f8bd8a49d13f17aae.

* Address review comments
 2018-07-20 11:55:32 +01:00
Dominic Fox
7217a27b28 Allocate ports in a non-deprecated way 2018-07-20 11:38:33 +01:00
Dominic Fox
935c4d2863 Remove non-compiling tests 2018-07-20 11:04:02 +01:00
Dominic Fox
62c2e1c892 OS merge 2018-07-19 2018-07-19 16:43:46 +01:00
Chris Rankin
fe9b89369f
CORDA-1816: Migrate JarFilter plugin to corda-gradle-plugins. (#3651) 2018-07-19 16:35:36 +01:00
Florian Friemel
7466463b89
[CORDA-1572] Create marker file to track initial registration status. (#3621) 
[CORDA-1572] Create marker file to track initial registration status.
 2018-07-19 16:20:04 +01:00
Konstantinos Chalkias
a94dbc9c9a
Change SZ to CZ in the cert hierarchy diagram (#3655) 2018-07-19 16:07:50 +01:00
Dominic Fox
7a18dbb8ed
Merge pull request #3644 from corda/flow-test-rationalisation 
Flow test rationalisation
 2018-07-19 15:33:43 +01:00
Dominic Fox
d1455b7a0e Move hamkrest version number into top-level configuration 2018-07-19 14:21:07 +01:00
Dominic Fox
f3d9750ea5 Eliminate needless equalTo 2018-07-19 13:47:18 +01:00
Dominic Fox
c0966067cc Move andRunNetwork out of transaction block 2018-07-19 12:02:46 +01:00
Dominic Fox
974db3a15b Rename matcher 2018-07-19 12:00:02 +01:00
Dominic Fox
2992866269 Eliminate unnecessary transactions 2018-07-19 11:45:42 +01:00
Dominic Fox
fc5cc89fdb Renaming matchers 2018-07-19 11:36:07 +01:00
Nick Arini
82d7ec0729
Na testnet screenshots (#3647) 
* update docs/screenshots
 2018-07-18 16:38:30 +01:00
Chris Rankin
099756c4c7
Replace internal JDK reference with ASM reference. (#1281) 2018-07-18 16:32:16 +01:00
bpaunescu
53b398a460
ENT-2116: handle amqp client remote error, added test (#3636) 
* ENT-2116: handle amqp client remote error, added test

* ENT: 2116 rename test, added logging

* ENT-2116: rename test to indicate its purpose
 2018-07-18 16:07:42 +01:00
Chris Rankin
1b05ccd397
Merge pull request #1280 from corda/chrisr3-os-merge 
Merge up to e879de70f306af30a80ecbd125dab799aeeaf268.
 2018-07-18 15:35:54 +01:00
Dominic Fox
0780d6051e Use startFlowAndRunNetwork 2018-07-18 15:21:04 +01:00
Dominic Fox
201628e44f Extract common test functionality into mixin interfaces 2018-07-18 13:49:49 +01:00