ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-15 15:12:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,405 Commits 96 Branches 407 Tags
Commit Graph

12405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Sailer
a60cd9d356
ENT-2131 Add comment about schema search path for PostgreSQL (#1080) 
* Add documentation for schema search path
 2018-06-26 17:25:43 +01:00
Katelyn Baker
a58eac6172
Merge pull request #1079 from corda/kat-merge-20180626 
OS -> Ent merge
 2018-06-26 16:27:43 +01:00
Chris Rankin
35e9396ce3
Gradle fixes for JMeter capsule: (#1077) 
- Consistent Log4J artifacts
- Depends on processResources task
- Include as dependency of assemble task
 2018-06-26 13:45:32 +01:00
Tommy Lillehagen
1eedaaa45f Fix merge - add missing entry in bintrayConfig 2018-06-26 13:36:39 +01:00
Katelyn Baker
7a2c15fc5e Merge remote-tracking branch 'open/master' into kat-merge-20180626 2018-06-26 12:27:24 +01:00
Chris Rankin
a4d2acbea2
ENT-1467: Make the deterministic JDK image compatible with IntelliJ. (#3416) 
* Expand the deterministic JDK image to make it friendlier to IntelliJ.
* Fix Gradle always to use the latest deterministic rt.jar available.
* Write JDK items directly from Gradle.
 2018-06-26 11:53:16 +01:00
Michele Sollecito
2497b0b90a
Merge pull request #1073 from corda/mkit-os-ent-merge 
OS -> ENT Merge e00c7706c3f52d0e338f83d169e60c99d623f1c5
 2018-06-26 11:49:06 +01:00
Tudor Malene
4ea8091667
CORDA-1670 fix multiple CorDapps for flow check (#3436) 
* CORDA-1670 fix multiple CorDapps for flow check

* CORDA-1670 fix multiple CorDapps for flow check

* CORDA-1670 address code review comment
 2018-06-26 11:32:49 +01:00
Michele Sollecito
ab37686ba0
[ENT-2135]: Reigning in the over-ambitious flow framework default thread pool size (#1075) 2018-06-26 11:26:19 +01:00
Thomas Schroeter
a70ed52e87
Finding the replica with the most advanced replication index (#1072) 2018-06-26 11:07:16 +01:00
Tommy Lillehagen
1d95ffba3a
CORDA-1674 - Publish Node Explorer artefact (#3437) 2018-06-26 10:46:04 +01:00
Chris Rankin
14810f25de
Fix warning for lambda. (#3438) 2018-06-26 10:44:08 +01:00
Michal Kit
d060e95834 Merge OS -> ENT up to e00c7706c3f52d0e338f83d169e60c99d623f1c5 2018-06-26 10:02:33 +01:00
Katelyn Baker
06d27b57c1
CORDA-1662 - Corda Serialization Evolution breaksdown with Java classes (#3427) 
Nullability logic was relying on annotations that Kotlin applies by
default but is left to the developer in Javaland. Change this around
so it works for both.

In Kotlin, the property must be nullable, in Java, it can't be a
primitive.
 2018-06-26 09:31:35 +01:00
Anthony Keenan
b0946f0a97
[ENT-1994] Add documentation for operational node upgrades (#1036) 
* Add documentation for operational node upgrades

* Add documentation for operational node upgrades

* Address review comments

* Some additional detail added after Richards comments

* Restructure page to make more logical sense
 2018-06-25 17:35:11 +01:00
Michal Kit
e00c7706c3
CORDA-1661 Reverting DEV certificates (#3422) 
* CORDA-1661 Reverting DEV certificates

* Addressing review comments

* Removed the intermediate certificate from the trust store and added some test cases for the revocation check
 2018-06-25 16:40:51 +01:00
Tudor Malene
868763f82b
Fix for running tests from Idea (#3425) 2018-06-25 15:15:52 +01:00
Viktor Kolomeyko
21d06a8aa9 ENT-2132 Introduce a boolean flag which controls whether we should re-try RPC connection. (#3433) 
In case of initial logon - it will not be re-tried to cater for invalid endpoint and/or credentials.
However, if connection been successfully established once, re-try logic is getting activated.
 2018-06-25 14:13:21 +01:00
Michele Sollecito
2a050481f6
Merge pull request #1064 from corda/os-merge-b97af47 2018-06-25 13:54:16 +01:00
Tudor Malene
9be4c5dca4
CORDA-1567 Remove all traces of the out-of-process verifier (#3424) 2018-06-25 13:01:33 +01:00
Michele Sollecito
34e52551fd
[CORDA-1663]: Node won't start if cordapps generate states prior to deletion (fix). (#3432) 2018-06-25 11:59:43 +01:00
Shams Asari
98cd8be160 Merge remote-tracking branch 'open/master' into os-merge-b97af47 
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
#	tools/bootstrapper/build.gradle
 2018-06-25 11:38:30 +01:00
Shams Asari
b97af477b2
CORDA-1603: Class carpenter able to synthesis Cash.State objects (#3400) 
This requires the class carpenter to be able to run in a "lenient" mode where it permits synthesised classes to implement interfaces with unimplemented methods.
 2018-06-25 11:33:37 +01:00
Daniel Cordell
6a51ed1f8d
Merge pull request #951 from corda/colljos-dev-publish-artifactory 
Fix incorrect repoKey used to publish to Artifactory.
 2018-06-25 10:35:57 +01:00
Anthony Keenan
68d4ed0cd9 [ENT-1955] Fix LaTeX errors when building docs PDF (#3426) 
* Fix latex errors when building docs PDF

* Experimenting
 2018-06-24 11:04:08 +01:00
Anthony Keenan
7d975a43e0
Merge pull request #1058 from corda/chrisr3-os-merge 
Merge from Open Source.
 2018-06-23 17:32:27 +01:00
Shams Asari
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper (#3419) 
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.

Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
 2018-06-23 11:36:10 +01:00
Chris Rankin
8b3a5432cb Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge 2018-06-23 00:06:11 +01:00
Christian Sailer
c35f576091
ENT-1953 enterprise tuning config documentation (#996) 
* ENT-1953 enterprise tuning config documentation

* Add information about suspended flows

* Review: dropped all the dangerous low level flags that should not be tweaked by users, added some more general explanation.

* Review: typo plus comment about db impact

* Reshuffle doc to be more consistent

* Review: more refinements

* Reflect smart default values for performance properties

* Code review: typo
 2018-06-22 21:41:31 +01:00
Andrius Dagys
366af50150 CORDA-1644: Add a more descriptive error message when the notary type is mis-configured. 2018-06-22 17:00:03 +01:00
Rick Parker
2fe5bae8a7
ENT-1953 enterprise tuning config (#1057) 
* ENT-1953 enterprise tuning config

* Keep flowThreadPoolSize at 1 for integration tests as some expect certain ordering it seems.

* Log thread count for SMM
 2018-06-22 16:39:17 +01:00
Andras Slemmer
84cdf22e5f
Merge pull request #1056 from corda/ENT-2117/aslemmer-remove-sgx-code 
ENT-2117: Remove sgx code
 2018-06-22 15:34:37 +01:00
cburlinchon
465915ac83
[ENT-1289] Exit node if db down (#918) 
* Exit if the db connection is lost
 2018-06-22 14:57:43 +01:00
Chris Rankin
02348a584d
CORDA-1639: Resolve ProviderMismatchException when copying a file into a ZIP. (#3421) 
* Resolve ProviderMismatchException when copying a file into a ZIP.
* Review tweaks.
 2018-06-22 12:12:31 +01:00
Andras Slemmer
747dee9b8b Delete/move sgx-jvm to oblivium-old 2018-06-22 10:44:00 +01:00
Andras Slemmer
013f1a3cb6 Remove verify-enclave 2018-06-22 10:31:00 +01:00
Andras Slemmer
dcfcd4f64b git mv hsm-tool 2018-06-22 10:24:24 +01:00
Tudor Malene
687ed95994
CORDA-1407 Fix explorer rpc access rights (#3413) 2018-06-22 09:48:13 +01:00
Tudor Malene
d0300261cb
Merge pull request #1052 from corda/tudor-merge-21-06 
Tudor merge 21 06
 2018-06-22 09:33:46 +01:00
Chris Rankin
b9eb956c6e ENT-1463, ENT-1903: Document new minimum JDK version. (#3418) 2018-06-22 09:24:13 +01:00
Tudor Malene
692d421abf ENT-1892, ENT-1875 - doc fixes (#1048) 2018-06-22 09:23:47 +01:00
Michele Sollecito
a76c093df5
[ENT-2115]: Drop CONTRIBUTORS.md. (#1053) 2018-06-22 09:11:14 +01:00
Chris Rankin
473d97e6c4
Upgrade to Gradle 4.8.1 (#3420) 
See: https://github.com/gradle/gradle/releases/tag/v4.8.1
 2018-06-22 08:36:04 +01:00
Anthony Keenan
3125ec9f73 [ENT-1955] Documentation fixes (#3417) 2018-06-21 16:57:30 +01:00
Tudor Malene
1905f23093 fix merge 2018-06-21 16:51:58 +01:00
tudor.malene@gmail.com
fb3e216318 Merge remote-tracking branch 'open/master' into tudor-merge-21-06 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
 2018-06-21 16:51:19 +01:00
Florian Friemel
66b67b231a
[CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option… (#3394) 
* [CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option) arguments.

* Respond to feedback from anthonykeenan.
 2018-06-21 16:50:02 +01:00
Tudor Malene
381aadc78f
ENT-1796 RPC SSL (#3401) 
* ENT-1796 add just-generate-rpc-ssl-settings command line flag. Fix ssl configuration and documentation

* ENT-1796 small fix. change alias

* ENT-1796 address code review changes

* ENT-1796 revert file

* ENT-1796 Added check to display better error message

* ENT-1796 Doc fixes
 2018-06-21 16:46:05 +01:00
Michele Sollecito
62088e4710
Fixes (#1050) 2018-06-21 16:35:20 +01:00
Andrius Dagys
d7ee6fc361
Merge pull request #1044 from corda/andrius/merge-06-21-2 
Andrius/merge 06 21 2
 2018-06-21 15:55:05 +01:00