Sync update and bump version to 0.1.1
Signed-off-by: Eric Zhao <sczyh16@gmail.com>
diff --git a/README.md b/README.md
index d112457..a49a902 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Sentinel Dubbo Adapter
+> Note: 中文文档请见[此处](https://github.com/alibaba/Sentinel/wiki/%E4%B8%BB%E6%B5%81%E6%A1%86%E6%9E%B6%E7%9A%84%E9%80%82%E9%85%8D#dubbo)。
+
Sentinel Dubbo Adapter provides service consumer filter and provider filter
for [Dubbo](http://dubbo.io/) services.
@@ -51,3 +53,13 @@
then extract it at provider side. Sentinel Dubbo Adapter has implemented a filter (`DubboAppContextFilter`)
where consumer can carry application name information to provider automatically.
If the consumer does not use Sentinel Dubbo Adapter but requires flow control based on caller, developers can manually put the application name into attachment with the key `dubboApplication`.
+
+## Global fallback
+
+Since version 0.1.1, Sentinel Dubbo Adapter supports global fallback configuration.
+The global fallback will handle exceptions and give replacement result when blocked by
+flow control, degrade or system load protection. You can implement your own `DubboFallback` interface
+and then register to `DubboFallbackRegistry`. If no fallback is configured, Sentinel will wrap the `BlockException`
+then directly throw it out.
+
+Besides, we can also leverage [Dubbo mock mechanism](http://dubbo.apache.org/#!/docs/user/demos/local-mock.md?lang=en-us) to provide fallback implementation of degraded Dubbo services.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a7ed335..e34e9f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-adapter</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1</version>
</parent>
<artifactId>sentinel-dubbo-adapter</artifactId>
<packaging>jar</packaging>
diff --git a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DefaultDubboFallback.java b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DefaultDubboFallback.java
index b97f703..e41b51b 100644
--- a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DefaultDubboFallback.java
+++ b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DefaultDubboFallback.java
@@ -23,6 +23,7 @@
/**
* @author Eric Zhao
+ * @since 0.1.1
*/
public class DefaultDubboFallback implements DubboFallback {
diff --git a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallback.java b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallback.java
index d077ee3..f529ae3 100644
--- a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallback.java
+++ b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallback.java
@@ -24,6 +24,7 @@
* Fallback handler for Dubbo services.
*
* @author Eric Zhao
+ * @since 0.1.1
*/
public interface DubboFallback {
diff --git a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallbackRegistry.java b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallbackRegistry.java
index fe06741..9f87e61 100644
--- a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallbackRegistry.java
+++ b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallbackRegistry.java
@@ -22,6 +22,7 @@
* give fallback result in most circumstances.
*
* @author Eric Zhao
+ * @since 0.1.1
*/
public final class DubboFallbackRegistry {
