ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,173 Commits 91 Branches 405 Tags 354 MiB
53509f9a52
Commit Graph

11173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tudor Malene
ad4bed779d
Merge pull request #515 from corda/merge/tudor_network_bootstrap 
Merge/tudor network bootstrap
 2018-03-06 15:15:00 +00:00
Chris Rankin
727f2b6cd1
Disable empty jar in top-level buildSrc project. (#2745) 2018-03-06 15:03:10 +00:00
Andrzej Cichocki
00c171cd61
CORDA-973 Turn on compression for checkpoints and tx storage (#490) 2018-03-06 15:01:30 +00:00
Katarzyna Streich
e4d2155671
Add version logging to hsm signing service (#502) 
Add version logging to hsm signing service
 2018-03-06 14:56:05 +00:00
Konstantinos Chalkias
4121f70da3
CORDA-1175 Docs numbering issue and counterparty consistency. (#2744) 2018-03-06 14:22:38 +00:00
Tudor Malene
549d271047 fix merge 2018-03-06 14:04:23 +00:00
Christian Sailer
d79e365a5b
Jmeter ssh tunnel properties for the new perf cluster (#513) 2018-03-06 12:06:41 +00:00
tudor.malene@gmail.com
98a4fe1ce3 Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
 2018-03-06 11:37:30 +00:00
Konstantinos Chalkias
65bfc833d3
CORDA-1173 - SwapIdentityFlow doc fixes (#2740) 2018-03-06 11:12:25 +00:00
Chris Rankin
24e08f9950
Merge pull request #514 from corda/os-merge-050318 
O/S merge 050318
 2018-03-06 11:09:08 +00:00
Matthew Nesbit
81f4bbcaf3
Fix flaky bridge test and an associated deadlock during rollback in the BridgeManager code. (#2739) 2018-03-06 10:49:29 +00:00
Konstantinos Chalkias
f1856f0146
CORDA-1145 - troubleshooting updates (#2738) 2018-03-06 10:28:10 +00:00
Michele Sollecito
6479d7d8ff
[CORDA-1156]: Output of run networkMapFeed and run networkMapSnapshot not consistent in shell (fixed) (#2733) 2018-03-06 10:15:17 +00:00
Chris Rankin
596edcc2ae Merge commit '29ccd4d' into os-merge-050318 2018-03-05 23:21:35 +00:00
Chris Rankin
2462188b9b [CORDA-1162] Write API class/interface/method annotations in ascending order. 2018-03-05 23:03:59 +00:00
Chris Rankin
c9616cb15e [CORDA-1148] Include all of the vararg methods in our public API. 2018-03-05 23:02:05 +00:00
Tudor Malene
3a247f2966
CORDA-1147 - fix shell (#2730) (#2737) 2018-03-05 19:11:04 +00:00
Tudor Malene
5efea22a9b
Network Bootstrap changes to master (#2736) 
* Added exclude whitelist to Network Bootstrapper to enable fine grained testing (#2666)

* Added exclude whitelist to Network Bootstrapper to enable fine grained testing.

* code review change

(cherry picked from commit d4f9b10)

* CORDA-1150 - better log messages (#2721)

* CORDA-1150 better log messages

* CORDA-1150 better log messages

* CORDA-1150 better log messages

(cherry picked from commit 87c5ad8)

* fixed merge

* remove unused function
 2018-03-05 19:10:48 +00:00
Katelyn Baker
d116b5e9f4
CORDA-1140 - FOR RPC Client P2P context use AMQP (#2716) 
* CORDA-1140 - FOR RPC Client P2P context use AMQP

* Review comments

* Review comments

* review comments

* review comments
 2018-03-05 18:05:32 +00:00
Andrzej Cichocki
29ccd4dbb8
CORDA-1131 Upgrade plugins to 4.0.5 (#2725) 2018-03-05 17:38:32 +00:00
Shams Asari
84ff1c875a
CORDA-1006: Undoing the wiring of maxMessageSize as it's not correctly implemented and updating the docs to clarify its status. (#2501) (#2729) 
The network parameter was just fed into Artemis' minLargeMessageSize property which isn't the same thing.

(cherry picked from commit 49f75da)
 2018-03-05 17:26:08 +00:00
Chris Rankin
382b424810
Merge pull request #2727 from corda/chrisr3-vararg-apis 
Fix public API definition for Gradle Plugin 4.0.4
 2018-03-05 16:43:40 +00:00
igor nitto
1caca44076
Fixed smoke tests after config parsing changes [CORDA-926] 2018-03-05 15:32:05 +00:00
Andrzej Cichocki
1470f294d4
Add artifactory as repo for TC-published gradle plugins (and cordform-common). 2018-03-05 15:15:37 +00:00
Anthony Keenan
cd3beabcc0 Finalise API stabilty 2018-03-05 14:34:18 +00:00
Andrius Dagys
37de2e770e CORDA-696: Contract upgrade transactions - handle WhitelistedByZoneAttachmentConstraint for input state constraint verification 2018-03-05 14:34:18 +00:00
Chris Rankin
76447b0298
Merge pull request #508 from corda/chrisr3-merge-os 
O/S merge up to ef703c50
 2018-03-05 13:50:55 +00:00
Shams Asari
067c9fb75f
CORDA-1082: Add doc for --just-generate-node-info (#2719) 2018-03-05 13:18:53 +00:00
Chris Rankin
04610b8545 Merge remote-tracking branch 'public/master' into chrisr3-merge-os 
O/S merge up to ef703c50
 2018-03-05 12:27:49 +00:00
Chris Rankin
17dd7b964d [CORDA-1162] Write API class/interface/method annotations in ascending order. 2018-03-05 12:12:16 +00:00
Chris Rankin
d27fabc0df [CORDA-1148] Include all of the vararg methods in our public API. 2018-03-05 12:12:16 +00:00
Chris Rankin
ef703c50be
Configure buildSrc to be multi-module. (#2658) 
* Configure buildSrc to be multi-module.
* Declare canonicalizer plugin's descriptor via build.gradle.
 2018-03-05 12:07:36 +00:00
Shams Asari
4a73a80b39
CORDA-1160: Only read node-info files if their last modified time has changed. (#2717) 2018-03-05 11:10:38 +00:00
Christian Sailer
e19f9a3841
CORDA-1122 Tweak Artemis for performance (#496) 
* ENT-1434 - tweak Artemis for P2P to auto commit and send asynchronously.

* ENT-1434 - tweak Artemis for P2P to auto commit and send asynchronously.

* Fix test compilation
 2018-03-05 10:47:45 +00:00
Andras Slemmer
7c459f3c99
Merge pull request #445 from corda/aslemmer-fix-added-sm-event 
Only emit SM Add events when the flow signals that it started
 2018-03-05 10:45:10 +00:00
Andrzej Cichocki
26fe90c8e9
CORDA-973 Allow deserialization of any checkpoint/storage encoding. (#2693) 2018-03-05 10:11:26 +00:00
Joel Dudley
91fd46f2c0
Updates text of running node shel. 2018-03-02 17:48:45 +00:00
Rick Parker
08decac922
CORDA-1144 Fix documentation that refers to IRS demo code (#2711) 2018-03-02 15:36:54 +00:00
Mike Hearn
27d59de9fa
Merge pull request #503 from corda/mike-merge-80c00b920b 
O/S Merge to 80c00b920b
 2018-03-02 16:15:29 +01:00
Mike Hearn
abc281056f Merge remote-tracking branch 'open/master' into mike-merge-80c00b920b 2018-03-02 15:17:32 +01:00
Mike Hearn
80c00b920b
Fix another non-serializable exception, add docs, fix a possible security issue. (#2707) 
* Fix another non-serializable exception, add docs, fix a possible security issue.

* Update API definition to reflect methods added to make more exceptions serializable
 2018-03-02 15:10:54 +01:00
Katelyn Baker
799d90b350
CORDA-1134 - Don't use private serializes for all caps public properties (#2692) 
* CORDA-1134 - Don't use private serializes for all caps public properties

* Small fix

* Review Comments
 2018-03-02 13:21:27 +00:00
Katelyn Baker
06a6eace67
CORDA-1115 - Cannot serialize private nested objects (#2665) 
* CORDA-1115 - Cannot serialize private nested objects

Shown up by the simm-valuation-demo the problem was where a private
object field of an object was being serialised within the outer objects
context (see tests added for example)

Fix is to switch from Kotlin reflection back to Java.

Additional fix to the test where it was comparing two lists of state
references in a flow and they weren't equal because they weren't in the
same order... This I assume is just an oversight (in that them being
in a different order but otherwise the same is actually fine) so
converting to set comparison

* Fix forward port issue where fingerprinting has moved

* Review Comments

* Review Comments

* Review Comments

* Gran -> Grab
 2018-03-02 13:13:00 +00:00
Joel Dudley
41bdad5aa2
Makes it clear that monitoring must be turned on. 2018-03-02 12:49:44 +00:00
Michal Kit
021b677b7d
Renaming DAO for the CSR (#500) 2018-03-02 12:15:46 +00:00
Shams Asari
965035a92e
Merge pull request #501 from corda/os-merge-020318 
O/S merge 020318
 2018-03-02 11:54:41 +00:00
Michal Kit
8f05dc2230
Renaming configuration sections for doorman and network map (#472) 2018-03-02 11:41:00 +00:00
Joel Dudley
617838c108
Removes output that is no longer logged. 2018-03-02 11:20:29 +00:00
Katelyn Baker
7d3b585a9c
RELEASE: Bump platform version past V3 (#2701) 2018-03-02 11:18:24 +00:00
Shams Asari
a59083ceb2 Merge remote-tracking branch 'open/master' into os-merge-020318 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
 2018-03-02 10:42:03 +00:00