ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 00:38:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,678 Commits 91 Branches 405 Tags 354 MiB
6ddf684846
Commit Graph

10678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrzej Cichocki
6ddf684846
Fix compile errors. 2018-01-19 15:12:33 +00:00
Andrzej Cichocki
bd342a690c
Merge commit 'bbcafca959b2d468a6f4f9bb847a1bbb7bfc9fdc' into andr3ej-os-merges 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
 2018-01-19 13:46:27 +00:00
Andrzej Cichocki
7ac1cbd379
Merge commit 'e699dad076fc1d81b8bd9529747e2922728ce2e0' into andr3ej-os-merges 
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
 2018-01-19 13:40:16 +00:00
Andrzej Cichocki
16c3250669
Merge commit 'a3fd653affb01a660b2be31314866d8d1f1715de' into andr3ej-os-merges 
# Conflicts:
#	docs/source/serialization.rst
 2018-01-19 13:10:08 +00:00
Matthew Nesbit
5dc15b8032
Merge pull request #381 from corda/andr3ej-matthew-os-merge 
Matthew OS merge
 2018-01-19 08:52:57 +00:00
Shams Asari
2f8836c8ad
Some long overdue cleaning up of some of the doorman code. (#362) 2018-01-18 23:08:02 +00:00
Andrzej Cichocki
f3c5ae2ff6
Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise 
# Conflicts:
#	docs/source/changelog.rst
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
 2018-01-18 16:48:05 +00:00
Thomas Schroeter
e9f0c8eca8
Merge pull request #361 from corda/thomas-mysql-reconnect 
Retry obtaining DB connection
 2018-01-18 16:38:47 +00:00
Katarzyna Streich
133cf13674
Remove primary key constraint on host and port (#336) 
* Remove primary key constraint on DBHostAndPort

* Update migration file
 2018-01-18 16:24:06 +00:00
Katelyn Baker
9575381733
Merge pull request #378 from corda/clint/compilerxml-fixupdate 
Added -parameters as an additional command line options to revert it …
 2018-01-18 15:03:15 +00:00
Andrzej Cichocki
a099f30e61
Merge pull request #377 from corda/andr3ej-entbot 
Merge my conflicting changes from OS
 2018-01-18 12:59:41 +00:00
Clinton Alexander
ccae3acf7e Added -parameters as an additional command line options to revert it being removed during a merge. 2018-01-18 12:31:56 +00:00
Katarzyna Streich
f2f803ecd5
HSM signing of network parameters (#363) 
Add HSM signing of network parameters
 2018-01-18 12:05:18 +00:00
Andrzej Cichocki
42e1a38c6b
Merge commit 'ea57639a378fa45f0aef6930bc4450d0bbfaa5f4' into andr3ej-entbot 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
 2018-01-18 11:15:14 +00:00
Michal Kit
af21f6065d
Fixing missing certificate (#373) 
* Fixing missing certificate

* Addressing review comments
 2018-01-18 11:15:11 +00:00
Christian Sailer
7bd2210d2f
Merge pull request #374 from corda/christians/ENT-985-merge 
ENT-985 NetworkMapCaching
 2018-01-18 11:09:02 +00:00
Viktor Kolomeyko
299d9bef77 Minor: numbering update. 2018-01-18 11:03:41 +00:00
Andrzej Cichocki
bbcafca959
Retire DatabaseTransactionManager. (#2385) 2018-01-18 10:11:34 +00:00
josecoll
e699dad076
CORDA-917 Bootstrap nodes without Notary schemas (by default) (#2376) 
* Default jolokia version with optional override in CorDapp project gradle file.

* Bootstrap a node without Notary schemas by default.

* Revert unrelated Jolokia code change.

* Revert unrelated Jolokia code change.

* Addressed PR review feedback.
 2018-01-18 10:10:06 +00:00
Christian Sailer
d9fb2ae4a8 Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge 2018-01-18 09:56:46 +00:00
Katelyn Baker
619f333541
Merge pull request #2350 from corda/kat/docFix 
Serialization documentation update
 2018-01-17 22:14:43 +00:00
David Lee
6733e74fcd
Merge pull request #142 from corda/dl-design-admin-ui 
Approved by Mike H
 2018-01-17 17:56:08 +00:00
Katelyn Baker
a3fd653aff Serialization documentation update 2018-01-17 17:54:13 +00:00
joeldudleyr3
7a458323a0 Clarified some further points. 2018-01-17 17:54:13 +00:00
joeldudleyr3
4248660017 Various grammar fixes and clarifications. 2018-01-17 17:54:13 +00:00
joeldudleyr3
776289cb01 Corrects glossary. 2018-01-17 17:54:13 +00:00
David Lee
c4bfc49d0c Updated main doc 2018-01-17 17:52:45 +00:00
David Lee
fc4373ded7 Put near-term.md back (not sure why it got lost) 2018-01-17 17:50:10 +00:00
Shams Asari
d19eb4a9d7
Removed useHTTPS from NodeConfiguration as it's not needed by the node. (#2375) 
It's still expected to be present in node.conf if the web server needs to use SSL.
 2018-01-17 17:47:40 +00:00
Matthew Nesbit
6edf95506b
Rename the inbox (#2360) 
Add changelog entry

Address review comments

Alternate solution to service queues

Fixup after merge
 2018-01-17 16:06:31 +00:00
josecoll
d0b62db0d2
Backported fix. (#2378) 2018-01-17 16:02:10 +00:00
Joel Dudley
0638f8c539
Adds Java code samples for versioning docs. 2018-01-17 15:21:00 +00:00
Thomas Schroeter
f52be47b48 Retry obtaining DB connection 2018-01-17 14:23:15 +00:00
Andrzej Cichocki
ea57639a37
CORDA-924 Fix IntegrationTestingTutorial (#2349) 
i.e. H2 startup bug. also:
* Fix poor connection pool discipline
* Log cleanup failures instead of replacing foreground failure
 2018-01-17 14:23:13 +00:00
Clinton
a19b213d7d
Added conditional to disable tests when CORDA_DOCS_ONLY_BUILD envvar is present (#2371) 2018-01-17 13:08:00 +00:00
Joel Dudley
6e817f014d
Adds default endpoints for the Corda development webserver. 2018-01-17 11:04:37 +00:00
Christian Sailer
fca0afe591
CORDA-928 Caching in the NetworkMapCache (#2358) 
* CORDA-928 cache query results via `getPeerByLegalName` and `getNodesByIndentityKey` to avoid hitting the DB hard in RPC handling.

* Skip cache invalidation during init() - caches are still null.

* Remove registeredNodes/partyNodes caching of data feed.
Rewrite data feed to be initialised off the DB.
Add start method to trigger readyness/artemis listeners if there are nodes in the DB.

* Invalidate cache last rather than first when updating
 2018-01-16 21:15:15 +00:00
bpaunescu
52a6abefb5
Merge pull request #276 from corda/bogdan-date-to-localdatetime 
replace java.Date with java.time
 2018-01-16 19:53:08 +00:00
josecoll
a3436160cf Monitoring and Logging Design document (#129) 
* WIP draft of Monitoring and Logging design document (JIRA ENT-1109)

Added missing diagram.

Minor updates and reshuffle: Michele's proposal is an architectural/design implementation detail (not a solution in its own right).

Completed technical implementation detail.

Moved Design Decision signoff to top.
Moved current state of logging and reporting to Appendix.

WIP ...

Listed additional metrics to add.

Minor update to proposed solutions activities.

* Incorporating feedback following review by RGB.

* Incorporating feedback following review by MS.

* Added details about Artemis logging.

* Clarified usage of SLF4J

* Updated Design Decisions matrix.

* Decision point: should LOG4J2 output be separated for Corda Node vs CorDapps.
Clarify additional effort required in logging.
Minor reformatting for clarify.

* Clarifications following review feedback from WN

* Incorporating minor clarifications and feedback from WN.

* Incorporating Auditing requirements following conversation with Andrey.

* Updated following review feedback from MH.
 2018-01-16 18:03:18 +00:00
josecoll
c7ae92c103
Merge pull request #352 from corda/colljos-merge-release3-dp-master 
Merge from R3 Corda 3.0 Dev Preview release branch to master
 2018-01-16 17:33:28 +00:00
josecoll
ee2fe71d0b Removed reference to 'enterprise' caused by incorrect auto-merge. 2018-01-16 16:30:11 +00:00
Mike Hearn
d247e643ae Minor: tweaks to the discussion of network parameters and network map. 2018-01-16 17:18:49 +01:00
Joel Dudley
646cd3e103
Updates versioning docs. 2018-01-16 15:29:26 +00:00
Andrey Brozhko
9035a0521b ENT-1407 changing the docs logo. 2018-01-16 15:02:52 +00:00
josecoll
eb9a51af75 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 14:28:07 +00:00
josecoll
1522ab27f3
Merge pull request #364 from corda/colljos-merge-160118 
Merge OS to Enterprise
 2018-01-16 14:26:00 +00:00
przemolb
fb8f5efd08
Merge pull request #360 from corda/change-example-of-network-parameters 
Set maxMessageSize and maxTransactionSize at the real, useful values
 2018-01-16 14:20:40 +00:00
josecoll
42b4b80545 Fixed imports 2018-01-16 13:24:53 +00:00
josecoll
eb3798da5e Merge remote-tracking branch 'open/master' into colljos-merge-160118 2018-01-16 12:13:49 +00:00
Przemyslaw Bak
66b47f0926 Highlight some text. 2018-01-16 10:44:54 +00:00