Merge branch 'master' into gradle-build

Browse Source

Conflicts:
	.gitignore
	docs/src/info/readme.txt
	pom.xml
	spring-data-keyvalue-core/pom.xml
	spring-data-keyvalue-parent/.project
	spring-data-keyvalue-parent/pom.xml
	spring-data-redis/pom.xml
	spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisPubSubCommands.java
	spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
	spring-data-redis/template.mf
	spring-data-riak/pom.xml
	src/docbkx/appendix/appendix-schema.xml

...

This commit is contained in:

Costin Leau

2011-03-13 19:32:41 +02:00

parent 2b190f8492 29fa021a76

commit 120196f06d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available