commit f5de9d8875be6c18987b844fab65ba0f4ab3e998
author danikov <dan.lobianco@cloudsoftcorp.com> Fri Oct 28 14:24:22 2011 +0100
committer danikov <dan.lobianco@cloudsoftcorp.com> Fri Oct 28 14:24:22 2011 +0100
tree 5722215cd1cda9944e8779e82018e7fbd0c33c11
parent 19f4f2740cb0c4e98a163e4102c1a977dea4c9d5
parent fc59fd9b239feaaee38dec40013539dbc49ca223

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