10666 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Christian Sailer	d9fb2ae4a8	Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge	2018-01-18 09:56:46 +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
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
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
Przemyslaw Bak	7bc2f2a8e6	Set maxMessageSize and maxTransactionSize at the real, useful values	2018-01-16 10:02:53 +00:00
josecoll	24bf6df868	Merge branch 'master' into colljos-merge-release3-dp-master	2018-01-16 09:58:51 +00:00
Andrius Dagys	55b7035a44	Don't propagate internal notary service errors to the client (#2368)	2018-01-16 09:58:23 +00:00
David Lee	90021f9002	Merge pull request #105 from corda/dl-hadr-design-doc ... HA/DR design doc by Matthew Nesbit	2018-01-16 09:32:15 +00:00
Anthony Keenan	1367cd4adb	CORDA-912 Stop exposing internal node user, create user in testing infrastructu… (#2361) ... * Stop exposing internal node user, create user in testing infrastructure instead * Update kdocs	2018-01-15 19:30:33 +00:00
Andrzej Cichocki	75e74e67a1	CORDA-599 RPCSecurityManager is no longer lateinit (#2347)	2018-01-15 19:11:00 +00:00
David Lee	e817c95a78	Fixed typo; corrected note to 'certain databases'	2018-01-15 18:49:19 +00:00
David Lee	895b745c37	Added missing spaces	2018-01-15 18:47:17 +00:00
David Lee	d390716a9b	Added goals/non-goals headers; fixed typo	2018-01-15 18:45:30 +00:00
David Lee	788d88c8fd	Fixed typo	2018-01-15 18:42:55 +00:00
Shams Asari	5940417f5b	Merge pull request #357 from corda/shams-os-merge-120118 ... Merge from O/S	2018-01-15 17:36:04 +00:00
Mike Hearn	094e96d303	Move the CommercialPaperTest examples to a location where it'll be run by gradle/ci. Make sure the tests pass, even the example tests that are intended to fail, so these files are kept up to date as the code changes.	2018-01-15 17:56:21 +01:00