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

12430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Hearn
8a70cd1ba4 Improve tarball packaging. 
1) Fix path bug that breaks tarball build task on Mint Linux
2) Tarballs conventionally contain a single top level directory, to avoid
   extraction dumping things into the current directory unexpectedly.
 2018-06-28 12:22:05 +02:00
Andras Slemmer
cedfb3f069 Change flow executor thread names to be the same (#1111) 2018-06-28 11:07:28 +01:00
Thomas Schroeter
c32b7b1331 Node API: relocate licence file (#1100) 2018-06-28 10:11:41 +01:00
Andrius Dagys
75e30c8114
CORDA-1610: Retain progress tracker during flow retry - multithreaded SMM (#1049) 
* Test to show progress tracker losing updates when a flow is retried.

* Fix the injection logic - attach the new children to the old progress tracker
 2018-06-27 16:14:25 +01:00
Christian Sailer
20c53a5a45
ENT-2133 Explorer demo nodes fix (#1091) (#1098) 2018-06-27 16:09:49 +01:00
cburlinchon
72a29101c3
ENT-2147 HA doc review (#1096) 
* Corda to Corda Enterprise, remove CE source mention, CRL((certificate revocation list)
 2018-06-27 16:08:22 +01:00
Stefano Franz
8e75e78705
Merge pull request #1095 from corda/add_terms_to_splash 
ENT-2098 add print out of terms-of-use to node startup
 2018-06-27 15:08:26 +01:00
Thomas Schroeter
75354d2961
Merge pull request #1094 from corda/thomas/os-merge-2018-06-27 
OS merge
 2018-06-27 14:40:14 +01:00
stefanofranz
1ff95c1916 add print out of terms-of-use to node startup 2018-06-27 13:23:31 +01:00
Thomas Schroeter
eb698160fa Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-06-27 2018-06-27 13:00:37 +01:00
Thomas Schroeter
66cb0e389b
Warning timer thread should run as a daemon (#3450) 2018-06-27 12:57:37 +01:00
Chris Rankin
7e05e373d7
CORDA-1687: Remove unwanted hibernate-core from DemoBench and Node Explorer. (#3449) 2018-06-27 12:52:36 +01:00
Joel Dudley
3eef73020a
Update CONTRIBUTORS.md 2018-06-27 12:10:22 +01:00
Andrius Dagys
283d232784
Merge pull request #1090 from corda/andrius/os-merge-06-27 
Andrius/os merge 06 27
 2018-06-27 12:07:59 +01:00
Andrius Dagys
4281061c47 Merge remote-tracking branch 'open/master' into andrius/os-merge-06-27 2018-06-27 10:41:28 +01:00
Andrius Dagys
fdf267d735
TimedFlowTests: remove progress tracker completion timeout (#3448) 2018-06-27 10:39:28 +01:00
Joel Dudley
968fcc718a
Improve participants JavaDocs. (#3429) 
* Improve participants JavaDocs.

* Wording consistent with terminology.
 2018-06-27 09:39:56 +01:00
Joel Dudley
f529a2a88e
Update CONTRIBUTORS.md 2018-06-27 09:32:59 +01:00
Tommy Lillehagen
e3072ad320 Remove old TODO to upgrade Artemis to version 2.4+ (#3447) 2018-06-27 09:02:45 +01:00
Chris Rankin
8ecf3b5e49
CORDA-1685: Remove bank-of-corda.jar from DemoBench. (#3446) 2018-06-26 22:53:22 +01:00
Andrius Dagys
be1aff20a6
CORDA-1610: In addition to injecting the old progress tracker after flow retry, attach and re-subscribe to child trackers as well. (#3440) 2018-06-26 17:50:08 +01:00
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
Thomas Schroeter
ad2890193d
Specify Notary in CashIssueAndPaymentFlow and PaymentRequest (#3443) 
* Specify notary in CashIssueAndPaymentFlow

* Specify notary in PaymentRequest

* Address comments

* Default to the first notary in the `CashPaymentFlow`
 2018-06-26 16:45:18 +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
Andrius Dagys
9258b0e63b
Minor: TimedFlowTests are sometimes flaky in CI since the flow result… (#3441) 
Minor: TimedFlowTests are sometimes flaky in CI since the flow result future completes before the progress tracker is set to DONE. Instead of checking the progress tracker step immediately, wait for it with explicit timeout.
 2018-06-26 16:07:08 +01:00
Florian Friemel
79626e9c4c
[CORDA-1598] Make argument parsing more consistent. (#3423) 
We parse command line arguments twice, once in `CordaCaplet.java`
  to determine the config file and base directory, and then again
  in NodeArgsParser. NodeArgsParser accepts long options with a
  single hyphen, while CordaCaplet did not. This changes
  CordaCaplet to accept `--config-file` as well as `-config-file`,
  same for base-dir.
 2018-06-26 14:32:45 +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
Chris Rankin
b4d31b1c77
Upgrade Gradle wrapper JAR. (#3439) 2018-06-26 12:46:33 +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