ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-01 15:10:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,474 Commits 105 Branches 407 Tags
Commit Graph

12474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sollecitom
ec4ec7e8c6 Merge remote-tracking branch 'remotes/open/master' into merges/june-29-10-20 
# Conflicts:
#	docs/source/upgrade-notes.rst
 2018-06-29 10:22:16 +01:00
Tommy Lillehagen
43e934beb3 ENT-2194 - Fix badly formatted characters in startup banner (#1142) 2018-06-29 10:03:17 +01:00
Tommy Lillehagen
374b3d0a41 ENT-2040 - Remove dependency on PathUtilsKt in net.corda.core.internal (#1141) 2018-06-29 09:58:46 +01:00
szymonsztuka
2d61c76d9d Fix integration test in database mode for test added in ENT-2053 (#1138) 2018-06-29 09:52:36 +01:00
PokeyBot
62cb443892
Merge pull request #3470 from corda/pat/ENT-2014-cherry-pick 
Cherry-pick: ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries (#1101)
 2018-06-29 09:42:35 +01:00
Shams Asari
29677a6887 ENT-2171: Removing outdated information in the serialisation docs (#1137) 2018-06-29 09:01:20 +01:00
Shams Asari
8fb47e8072
ENT-2183: Change references to Corda 3 to Corda Enterprise in network map docs (#1132) 2018-06-29 08:48:51 +01:00
Michal Kit
7ae0775514
CORDA-1688 Updating CRL config docs (#3472) 
* CORDA-1688 Updating CRL config docs

* Addressing review comments
 2018-06-29 08:13:43 +01:00
Shams Asari
ff30f0769e
Merge pull request #1129 from corda/os-merge-d5b5825 
O/S merge from d5b5825
 2018-06-28 18:18:10 +01:00
Mike Hearn
33511b40dc Minor: work around a Kotlin compiler performance regressions 2018-06-28 18:24:50 +02:00
Thomas Schroeter
5c520bf328 Update docs (#1123) 
Corda -> Corda Enterprise
 2018-06-28 17:20:36 +01:00
Chris Rankin
4267513332
CORDA-1693: Ensure that DemoBench's RPC connections terminate on shutdown. (#3468) 2018-06-28 16:37:51 +01:00
Patrick Kuo
8df18e954f ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries (#1101) 
* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries
ENT-1880 Move identity key generation to network registration process

(cherry picked from commit c3ac203)
 2018-06-28 15:20:22 +01:00
Shams Asari
07995e0eb0 Merge remote-tracking branch 'open/master' into os-merge-d5b5825 
# Conflicts:
#	CONTRIBUTORS.md
#	tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt
 2018-06-28 15:10:58 +01:00
Patrick Kuo
c3ac203251
ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries (#1101) 
* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries
ENT-1880 Move identity key generation to network registration process
 2018-06-28 15:10:52 +01:00
Shams Asari
d5b5825c09
Docs: Removed remaining references to webAddress in the node config (#3467) 2018-06-28 15:03:27 +01:00
szymonsztuka
782d63ffe6 Fix compilation error after OS -> ENT merge (#1120) 2018-06-28 13:44:37 +01:00
Thomas Schroeter
b54292859a Increase timeout in TimedFlowMultiThreadedSMMTests (#1119) 2018-06-28 13:36:45 +01:00
Chris Rankin
76c114502e
CORDA-1686: Make Node Explorer release its RPC connection on shutdown. (#3457) 
* Make Node Explorer release its RPC connection on shutdown.
* Declare Explorer's login() function as tail-recursive.
* Replace lateinit rpcConnection with oridinary var.
* Notify the node when closing an RPC connection gracefully.
 2018-06-28 13:33:07 +01:00
Joel Dudley
82f79387a3
Update CONTRIBUTORS.md 2018-06-28 12:07:50 +01:00
Stefano Franz
de6e78b4a3
V2 gui for the bootstrapper (#3373) 
* V2 gui

* Misc small fixes and tweaks

* V2 gui

* More tweaks

* fix horizontal resize issue
 2018-06-28 12:05:36 +01:00
Stefano Franz
83abc053a1
Merge pull request #991 from corda/change_project_name 
rename enterprise project
 2018-06-28 11:59:35 +01:00
Michele Sollecito
992d6022d3
Merge pull request #1114 from corda/merges/june-28-09-45 
Merges: June 28th at 09:45
 2018-06-28 11:45:11 +01:00
Michele Sollecito
90719be030
Merge pull request #1113 from corda/revert-1109-merges/june-28-09-45 
Revert "Merges: June 28th at 09:45"
 2018-06-28 11:42:27 +01:00
Michele Sollecito
bbd4b3b944 Revert "Merges: June 28th at 09:45 (#1109)" 
This reverts commit e5ebf04c0f113f8151dc3e5c618a07717bc8f82d.
 2018-06-28 11:34:48 +01:00
Michele Sollecito
e5ebf04c0f
Merges: June 28th at 09:45 (#1109) 2018-06-28 11:26:38 +01:00
sollecitom
7d6f08d578 Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45 2018-06-28 11:25:53 +01:00
Rick Parker
a768904e4e CORDA-1695 Include thread ID in flow logging MDC (#3463) 2018-06-28 11:24:54 +01:00
Tommy Lillehagen
f663a84377 Minor spelling and grammatical fixes 2018-06-28 12:22:05 +02:00
Mike Hearn
c9e80451a8 Improve the Enterprise README file a bit. 2018-06-28 12:22:05 +02:00
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
sollecitom
c139b160eb Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45 2018-06-28 10:53:10 +01:00
Rick Parker
e2f657d679 ENT-2124 Flush before detach in Hibernate (#3465) 2018-06-28 10:51:28 +01:00
Thomas Schroeter
c32b7b1331 Node API: relocate licence file (#1100) 2018-06-28 10:11:41 +01:00
sollecitom
b09368a17a Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45 
# Conflicts:
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
 2018-06-28 09:51:11 +01:00
Shams Asari
84a86d32b7
Fixed broken smoke test caused by no notaries in the network parameters (#3461) 
For now the workaround is to manually select the notary. The proper solution is to add notaries to the network parameters in smoke tests.
 2018-06-28 09:43:29 +01:00
Rick Parker
322a8d4f54 ENT-2124 Flush before detach in Hibernate (#3462) 2018-06-28 09:25:56 +01:00
Viktor Kolomeyko
34923506f4
CORDA-1686: Make "rpc-client-sender" daemon (#3455) 
Such that they do not prevent application that started them from exiting.
 2018-06-28 08:53:30 +01:00
Mike Hearn
4e52a957d1 Minor: better error message when the config file isn't found (#3460) 2018-06-27 21:15:11 +01:00
Shams Asari
e401eb604d
Fixed CordaRPCClient test to avoid potential flakiness (#3459) 2018-06-27 20:23:26 +01:00
Shams Asari
eee2563bfa
CORDA-1660: Wiring up the CordaRPCClient class loader to the p2p serialisation context. (#3454) 
This is to allow the standalone shell to be able to receive WireTransactions containing Cash.State objects.
 2018-06-27 17:02:35 +01:00
Christian Sailer
f51407cd5d
Add comment about schema search path (#3444) 2018-06-27 16:48:46 +01:00
Viktor Kolomeyko
4cc4e3f01b
Fix DemoBench Windows installer (#3451) 
Specify paths to build tools correctly or else bugfixes will not applied.
 2018-06-27 16:45:39 +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
Joel Dudley
8c956c004f
Removes links to Corda source and templates (#3456) 2018-06-27 15:29:57 +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