brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [18/27] brooklyn git commit: Merge branch 'refs/heads/ENGR-1668-GemfireEntities-Strike2' into ENGR-2103-Gemfire-Effectors
Date Mon, 01 Feb 2016 17:30:58 GMT
Merge branch 'refs/heads/ENGR-1668-GemfireEntities-Strike2' into ENGR-2103-Gemfire-Effectors

Conflicts:
	.gitignore
	extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireServer.groovy
	extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireSetup.groovy
	extra/src/test/java/brooklyn/entity/nosql/gemfire/GemfireServerIntegrationTest.groovy
	extra/src/test/resources/brooklyn/entity/nosql/gemfire/eu/cache.xml
	gemfire/pom.xml
	gemfire/src/brooklyn/gemfire/demo/GatewayRequestHandler.java
	gemfire/src/main/java/brooklyn/gemfire/demo/GatewayRequestHandler.java
	gemfire/src/main/java/brooklyn/gemfire/demo/GeneralRequestHandler.java
	gemfire/src/main/java/brooklyn/gemfire/demo/HubManager.java
	gemfire/start.sh


Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/f5de9d88
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/f5de9d88
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/f5de9d88

Branch: refs/heads/0.4.0
Commit: f5de9d8875be6c18987b844fab65ba0f4ab3e998
Parents: 19f4f27 fc59fd9
Author: danikov <dan.lobianco@cloudsoftcorp.com>
Authored: Fri Oct 28 14:24:22 2011 +0100
Committer: danikov <dan.lobianco@cloudsoftcorp.com>
Committed: Fri Oct 28 14:24:22 2011 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message