Shams Asari d6054e4b4f Merge branch 'master' into shams-master-merge-081217 ... # Conflicts: # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt		2017-12-11 10:23:16 +00:00
..
dev	Merge branch 'master' into shams-master-merge-081217	2017-12-11 10:23:16 +00:00
prod	CORDA-822 - JMX Jolokia instrumentation (#2197)	2017-12-08 16:27:12 +00:00
test	Make logging available in IntelliJ between gradle clean and assemble (#929)	2017-06-28 09:54:09 +01:00