11 Commits

Author	SHA1	Message	Date
szymonsztuka	56e1f6c650	CORDA-1407 Node Explorer - fix total column	2018-06-19 12:21:40 +01:00
Tommy Lillehagen	a612ca234a	Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613	2018-06-13 21:45:00 +01:00
Shams Asari	b2f41d82f9	Merge fixes	2018-05-21 11:25:13 +01:00
Katelyn Baker	8c9773fc13	Merge build fix - add AMQP to RPC Proxy Web	2018-05-18 14:27:38 +01:00
Katelyn Baker	4ed3d779b0	merge build fix	2018-05-18 11:16:45 +01:00
Katelyn Baker	1cfc9c6e0c	Post merge cleanup for Max Mem Size	2018-05-18 09:54:56 +01:00
josecoll	4afc7f3824	Behave: fix compilation problem in IntelliJ (#830) ... * Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy. * Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.	2018-05-11 15:21:42 +01:00
Andrius Dagys	524ba27721	Fix merge issues	2018-05-03 13:52:11 +01:00
josecoll	f013c1dcb7	Address remaining PR review comments.	2018-05-02 11:09:25 +01:00
josecoll	ccd5f5fd5b	Re-apply previous fixes.	2018-05-02 10:47:12 +01:00
josecoll	764af04608	Moved RPC Proxy to own module in testing/qa/behave/tools ... Incorporating PR review feedback. Minor fixes to default path and additional copying of startup script.	2018-05-01 17:04:46 +01:00