1766 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fangjian0423	9d59a0e2e5	add apache license for rocketmq binder	2018-11-29 14:30:36 +08:00
xiaojing	473b3da642	Merge pull request #127 from pbting/patch-2 ... 添加新的说明	2018-11-29 11:04:57 +08:00
xiaojing	2d7f15c912	Merge branch 'master' into patch-2	2018-11-29 11:04:49 +08:00
xiaojing	19472f1216	Merge pull request #126 from pbting/master ... 订正 Nacos Config 的 reference 文档	2018-11-29 11:03:41 +08:00
xiaojing	ab92886012	Merge pull request #128 from fangjian0423/master ... Refactor binder and update examples	2018-11-29 11:03:23 +08:00
pbting	71522fc027	新增两个配置的说明 ... 1、新增 自定义 namespace 的配置说明 2、新增自定义 Group 的配置说明	2018-11-28 17:21:19 +08:00
pbting	d18e5c3a99	Update nacos-config.adoc	2018-11-28 17:17:22 +08:00
fangjian0423	baea051027	update rocketmq example	2018-11-28 17:14:25 +08:00
fangjian0423	7d039f4742	make metrics-core as provided dependency and refactor	2018-11-28 17:13:59 +08:00
fangjian0423	fe17a6c9fb	Merge remote-tracking branch 'upstream/master'	2018-11-28 15:32:52 +08:00
format	47b1f05e86	Merge pull request #119 from mercyblitz/master ... [Feature] Add Spring Cloud Bus module for Apache RocketMQ	2018-11-28 15:27:27 +08:00
fangjian0423	ac466e0bea	Merge remote-tracking branch 'upstream/master'	2018-11-28 15:16:11 +08:00
pbting	dd0f4bd6e7	Merge branch 'master' into master	2018-11-28 14:45:37 +08:00
pbting	c3c5ed5a1e	Update nacos-config.adoc	2018-11-28 14:39:31 +08:00
xiaojing	855e772f1f	Merge pull request #124 from pbting/patch-1 ... 修正Nacos Config 文档	2018-11-28 14:30:23 +08:00
pbting	19bb1d71c6	Update nacos-config.adoc	2018-11-28 11:26:03 +08:00
pbting	6e85bbf2c1	Update nacos-config.adoc	2018-11-27 23:04:32 +08:00
pbting	f7bcedc5db	订正测试代码 ... 订正测试代码	2018-11-27 23:03:08 +08:00
pbting	cc965dc2fc	修正文档中的表述 ... 修正文档中的表述	2018-11-27 22:56:47 +08:00
pbting	874515d773	Update nacos-config.adoc	2018-11-27 22:52:40 +08:00
pbting	967705985a	Update nacos-config.adoc	2018-11-27 22:51:15 +08:00
pbting	fc4f1dae84	修正Nacos Config 文档 ... 修正Nacos Config 文档	2018-11-27 22:48:58 +08:00
pbting	8d86ddc113	Merge pull request #3 from spring-cloud-incubator/master ... 同步一次代码操作	2018-11-27 19:46:25 +08:00
xiaojing	5683af3f09	Update README-zh.md	2018-11-27 19:18:49 +08:00
xiaojing	6ebf1ffd3c	Update README-zh.md	2018-11-27 18:26:25 +08:00
fangjian0423	0896af32bb	magic value refactor	2018-11-27 16:35:10 +08:00
flystar32	c6d955f589	update nacos version to 0.5.0 , close #113	2018-11-27 14:31:37 +08:00
fangjian0423	2ab11490dc	fixes #120 and do some refactor	2018-11-27 13:55:38 +08:00
mercyblitz	6e175b35d5	Fix bugs on example	2018-11-23 16:33:24 +08:00
mercyblitz	b75b19b58c	Polish Spring Cloud Bus	2018-11-23 14:52:45 +08:00
format	15179aeee2	Merge pull request #118 from pbting/master ... update acm reference docs	2018-11-22 17:30:20 +08:00
pbting	0e4461e671	Update acm.adoc	2018-11-22 17:26:54 +08:00
pbting	2a0296d1c8	Update acm.adoc	2018-11-22 17:25:51 +08:00
pbting	59cbe7d8cf	优化文档的描述 ... 1、关于 Group 值的配置额外突出目前只能支持 DEFAULT_GROUP 值的配置 2、关于dataid的格式也突出强调了易错点	2018-11-22 17:22:40 +08:00
xiaojing	46d0881caa	Merge pull request #117 from fangjian0423/master ... Update Sentinel Docs and Add RocketMQ Docs	2018-11-22 15:39:19 +08:00
fangjian0423	9e9ca72c88	update rocketmq example	2018-11-22 15:12:45 +08:00
fangjian0423	f79fdba50b	update sentinel docs	2018-11-22 14:36:46 +08:00
fangjian0423	80ecc84d54	fixes #116	2018-11-22 14:33:52 +08:00
mercybltz	0ad0014cbf	Polish spring-cloud-starter-bus-rocketmq	2018-11-22 13:02:33 +08:00
pbting	b5ad5acf10	Merge pull request #2 from spring-cloud-incubator/master ... 同步rocket stream binder 的实现	2018-11-20 17:25:38 +08:00
fangjian0423	bfae54b51e	using eclipse code formatter to format code	2018-11-20 17:17:44 +08:00
xiaojing	c34ecfffd8	Merge pull request #112 from fangjian0423/master ... Add RocketMQ binder and refactor Sentinel ReadableDataSource	2018-11-20 17:02:59 +08:00
fangjian0423	3a4baa156a	add rocketmq example	2018-11-20 14:22:18 +08:00
fangjian0423	2596f014f7	add rocketmq starter and fix some small problems	2018-11-20 14:21:31 +08:00
pbting	0819960020	Merge pull request #1 from spring-cloud-incubator/master ... 同步最新代码	2018-11-20 14:18:59 +08:00
fangjian0423	4539ed7183	update sentinel example and add sentinel reference doc	2018-11-20 14:15:10 +08:00
fangjian0423	3c33b234c8	fixes #91	2018-11-20 14:14:00 +08:00
fangjian0423	d88e27e45c	fix conflict	2018-11-20 12:00:36 +08:00
mercyblitz	b4b8fa0d19	Polish Config Server	2018-11-19 16:18:33 +08:00
xiaojing	0d88d81996	update parent version	2018-11-17 22:18:47 +08:00