Merge remote-tracking branch 'upstream/master'

2015-11-02 01:38:37 +08:00
parent d0f5009996 7d3483daad
commit 37cfa4b295
23 changed files with 464 additions and 169 deletions
--- a/pom.xml
+++ b/pom.xml
@ -56,6 +56,7 @@
 		<module>execute-around</module>
 		<module>property</module>
 		<module>intercepting-filter</module>
+		<module>producer-consumer</module>
 		<module>poison-pill</module>
 		<module>lazy-loading</module>
 		<module>service-layer</module>