This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git
The following commit(s) were added to refs/heads/master by this push:
new de815b9 Updated FAQ (markdown)
de815b9 is described below
commit de815b98f6a529392ed0c32e7f5b19325176e6ea
Author: Xin Wang <lovep...@hotmail.com>
AuthorDate: Sat Apr 28 16:28:33 2018 +0800
Updated FAQ (markdown)
---
FAQ.md | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/FAQ.md b/FAQ.md
index 351255f..7cb24a9 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,6 +1,15 @@
Q: Where is dubbo-admin?
>A: dubbo-admin has been moved from core repository to
>https://github.com/apache/incubator-dubbo-ops since 2.6.1
+Q: What's the difference between version 2.6.x and version 2.5.x ?
+
+>A:
+>* Currently, dubbo keeps two versions evolve in parallel: 2.5.x, 2.6.x, check
#1208 for detailed version management plan.
+>* For contributors, please make sure all changes on the right base branch,
that is, only use 2.5.x branch for bugfixes, otherwise use master.
+>* For committers, make sure select the right label and target branch for
every PR, make sure 2.5.x merge to master as soon as possible.
+>* Feature Version：higher version, e.g. 2.6.x. We add new features to this
version, so applications have opportunities try new features. And also we will
merge changes made in the GA version.
+>* BugFix Version：lower version，e.g. 2.5.x. This is called the GA version,
which can be applied in production. We are supposed only to fix bugs in this
version, and increase the third version number when release.
+
Q: dubbo-admin在tomcat下部署报： Could not open ServletContext resource
[/WEB-INF/applicationContext.xml]
参考提问 [issue#735](https://github.com/alibaba/dubbo/issues/735)
@@ -8,4 +17,4 @@ Q: dubbo-admin在tomcat下部署报： Could not open ServletContext
resource [/
Q: 工程在docker bridag网络环境部署时，如何设置注册宿主机ip地址
参考提问 [issue#742](https://github.com/alibaba/dubbo/issues/742)
->A:
dubbo支持在启动阶段通过命令行参数指定注册的ip、port；具体使用方法可参照[dubbo-docker-sample](https://github.com/dubbo/dubbo-docker-sample)
\ No newline at end of file
+>A:
dubbo支持在启动阶段通过命令行参数指定注册的ip、port；具体使用方法可参照[dubbo-docker-sample](https://github.com/dubbo/dubbo-docker-sample)
--
To stop receiving notification emails like this one, please contact
wang...@apache.org.
