243 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fangjian0423	f40381fc6c	update docs	2018-12-06 20:17:07 +08:00
xiaojing	d874592e3f	Merge pull request #142 from fangjian0423/master ... Sentinel integration with feign and handle some issues	2018-12-06 19:12:07 +08:00
fangjian0423	54dcd7eaec	update sentinel docs	2018-12-06 16:11:42 +08:00
fangjian0423	ac2eee154d	Add log configuration for Sentinel	2018-12-06 16:09:32 +08:00
fangjian0423	cd6f79b16b	Polish #115	2018-12-06 16:02:18 +08:00
fangjian0423	0af67df3e3	using sentinel feign in nacos discovery example	2018-12-06 14:16:47 +08:00
fangjian0423	a560774966	Sentinel support feign and close #6	2018-12-06 11:50:48 +08:00
fangjian0423	b8f608eaa5	Merge remote-tracking branch 'upstream/master'	2018-12-06 11:44:41 +08:00
xiaojing	09aa04eaba	Merge pull request #140 from pbting/master ... add a title for end	2018-12-05 21:03:18 +08:00
pbting	ff30e58da6	add a title for end	2018-12-05 21:01:52 +08:00
xiaojing	d55bc6fcfc	Merge pull request #139 from pbting/master ... a solution for custom configure dataid	2018-12-05 20:58:27 +08:00
pbting	1cc2a20d18	update the format	2018-12-05 20:51:05 +08:00
pbting	90804663e5	update the format for document	2018-12-05 20:50:12 +08:00
pbting	4cae318da3	add a solution document fot nacos config shared configuration and custom dataids	2018-12-05 20:46:06 +08:00
xiaojing	5c86086e00	Update nacos-config.adoc	2018-12-05 15:24:33 +08:00
fangjian0423	53643b94ce	fixes #9	2018-12-05 12:45:02 +08:00
xiaojing	0c8bd1b58a	Merge pull request #137 from pbting/master ... add nacos configuration metadata	2018-12-05 10:27:23 +08:00
flystar32	eeba7e6aa6	update nacos discovery logic, support both health and enabled	2018-12-04 15:02:26 +08:00
pbting	86bd83af83	add nacos config configuration metadata	2018-12-04 14:29:01 +08:00
xiaojing	4f2eb7487d	Merge pull request #135 from pbting/master ... Nacos Config Support multi DataIds	2018-12-04 10:51:18 +08:00
pbting	356ce112a9	code format	2018-12-04 10:37:57 +08:00
pbting	63fd351256	Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba	2018-12-04 10:02:52 +08:00
pbting	997c633601	Merge pull request #4 from spring-cloud-incubator/master ... 同步一次外部代码	2018-12-04 10:02:17 +08:00
pbting	5e5fb2a068	Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba	2018-12-04 10:00:14 +08:00
pbting	ba90952880	nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接	2018-12-04 09:59:55 +08:00
fangjian0423	25aecfe1ad	update docs	2018-11-30 16:47:19 +08:00
fangjian0423	c665e97fb1	remove unuseful logging	2018-11-30 16:46:59 +08:00
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