Skip to content
This repository has been archived by the owner on Jun 16, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Cody committed May 15, 2017
2 parents 6fc15ff + 8c9c8bc commit e4254dc
Show file tree
Hide file tree
Showing 58 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion docs/jstorm-doc/Maintenance/DynamicAdjustLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Dynamic Adjust Log"
# Top-level navigation
top-nav-group: Maintenance
#top-nav-pos: 1
# top-nav-pos: 1
top-nav-title: Dynamic Adjust Log
---

Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/Maintenance_cn/DynamicAdjustLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ layout: plain_cn

# Top-level navigation
top-nav-group: Maintenance_cn
#top-nav-pos: 1
# top-nav-pos: 1
top-nav-id: DynamicAdjustLog_cn
top-nav-title: 动态调整日志
---
Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide/AdvancedUsage/API.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "API Introduction"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: API
sub-nav-pos: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "Grouping method introduce"
sub-nav-parent: API
sub-nav-group: AdvancedUsage
sub-nav-id: Grouping
#sub-nav-pos: 3
# sub-nav-pos: 3
sub-nav-title: Grouping Introduce
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "IBasicBolt interface introduce"
sub-nav-parent: API
sub-nav-group: AdvancedUsage
sub-nav-id: IBasicBolt
#sub-nav-pos: 3
# sub-nav-pos: 3
sub-nav-title: IBasicBolt Introduce
---

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "BackPressure on JStorm"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: BackPressure
sub-nav-pos: 9
Expand Down
4 changes: 2 additions & 2 deletions docs/jstorm-doc/ProgrammingGuide/AdvancedUsage/BlobStore.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
title: "How to use BlobStore"


#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: BlobStore
#sub-nav-pos: 6
# sub-nav-pos: 6
sub-nav-title: BlobStore

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Dynamic Adjust Application"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: DynamicAdjust
sub-nav-pos: 6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "Dynamic Adjust application configuration"
sub-nav-parent: DynamicAdjust
sub-nav-group: AdvancedUsage
sub-nav-id: Configuration
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: Dynamic-Adjust-Configuration
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "Dynamic Adjust metrics, enable/disable metrics"
sub-nav-parent: DynamicAdjust
sub-nav-group: AdvancedUsage
sub-nav-id: Metrics
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: Dynamic-Adjust-Metrics
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "Dynamic Adjust application worker/task's Parallel"
sub-nav-parent: DynamicAdjust
sub-nav-group: AdvancedUsage
sub-nav-id: Parallel
#sub-nav-pos: 3
# sub-nav-pos: 3
sub-nav-title: Dynamic-Adjust-Parallel
---

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "How to tune performance?"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: PerformanceTuning
sub-nav-pos: 10
Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide/AdvancedUsage/Plugins.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Plugins"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: Plugins
sub-nav-pos: 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "Flux Plugin, Generate Topology by configuration"
sub-nav-parent: Plugins
sub-nav-group: AdvancedUsage
sub-nav-id: Flux
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: Flux Plugin
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "HDFS Plugin"
sub-nav-parent: Plugins
sub-nav-group: AdvancedUsage
sub-nav-id: HDFS
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: HDFS Plugin
---

Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide/AdvancedUsage/SQL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "How to run SQL on jstorm"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: SQL
sub-nav-pos: 7
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "How to use Submit Topology by external system?"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: SubmitTopology
sub-nav-pos: 8
Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide/AdvancedUsage/Theory.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Run mechanism & Theory"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: Theory
sub-nav-pos: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "Acker"
sub-nav-parent: Theory
sub-nav-group: AdvancedUsage
sub-nav-id: Acker
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: Acker mechanism
---

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "User Defined Features"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: UserDefined
sub-nav-pos: 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "User Defined Alarm, report error to system"
sub-nav-parent: UserDefined
sub-nav-group: AdvancedUsage
sub-nav-id: Alarm
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: User-Defined-Alarm
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "User Defined Log, Switch log4j/logback, Use user's log configuration"
sub-nav-parent: UserDefined
sub-nav-group: AdvancedUsage
sub-nav-id: Log
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: User-Defined-Log
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "User Defined Metrics, Monitor application's key Metrics"
sub-nav-parent: UserDefined
sub-nav-group: AdvancedUsage
sub-nav-id: Metrics
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: User-Defined-Metrics
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: "User Defined Scheduler, Assign worker whatever user want"
sub-nav-parent: UserDefined
sub-nav-group: AdvancedUsage
sub-nav-id: Scheduler
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: User-Defined-Scheduler
---

Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide/AdvancedUsage/Window.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "How to use Window Framework?"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage
sub-nav-id: Window
sub-nav-pos: 9
Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide_cn/AdvancedUsage/API.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "API 介绍"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: API_cn
sub-nav-pos: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: API_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Grouping_cn
#sub-nav-pos: 3
# sub-nav-pos: 3
sub-nav-title: Grouping 介绍
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: API_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: IBasicBolt_cn
#sub-nav-pos: 3
# sub-nav-pos: 3
sub-nav-title: IBasicBolt 介绍
---

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "JStorm 限流控制/反压"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: BackPressure_cn
sub-nav-pos: 9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
# Top-level navigation
sub-nav-group: AdvancedUsage_cn
sub-nav-id: BlobStore_cn
#sub-nav-pos: 7
# sub-nav-pos: 7
sub-nav-title: BlobStore
---

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Dynamic Adjust Application"

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: DynamicAdjust_cn
sub-nav-pos: 6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: DynamicAdjust_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Configuration_cn
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: 动态更新配置
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: DynamicAdjust_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Metrics_cn
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: 动态调整Metrics
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: DynamicAdjust_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Parallel_cn
#sub-nav-pos: 3
# sub-nav-pos: 3
sub-nav-title: 动态调整并发
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "性能优化"
layout: plain_cn

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: PerformanceTuning_cn
sub-nav-pos: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Plugins"
layout: plain_cn

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Plugins_cn
sub-nav-pos: 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: Plugins_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Flux_cn
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: Flux 插件
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: Plugins_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: HDFS_cn
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: HDFS 插件
---

Expand Down
2 changes: 1 addition & 1 deletion docs/jstorm-doc/ProgrammingGuide_cn/AdvancedUsage/SQL.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "How to run SQL on jstorm"
layout: plain_cn

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: SQL_cn
sub-nav-pos: 7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "使用API提交Topology"
layout: plain_cn

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: SubmitTopology_cn
sub-nav-pos: 8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Run mechanism & Theory"
layout: plain_cn

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Theory_cn
sub-nav-pos: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: Theory_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Acker_cn
#sub-nav-pos: 1
# sub-nav-pos: 1
sub-nav-title: Acker 原理
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "User Defined Features"
layout: plain_cn

#sub-nav-parent: AdvancedUsage
# sub-nav-parent: AdvancedUsage
sub-nav-group: AdvancedUsage_cn
sub-nav-id: UserDefined_cn
sub-nav-pos: 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ layout: plain_cn
sub-nav-parent: UserDefined_cn
sub-nav-group: AdvancedUsage_cn
sub-nav-id: Alarm_cn
#sub-nav-pos: 2
# sub-nav-pos: 2
sub-nav-title: 自定义报错
---

Expand Down
Loading

0 comments on commit e4254dc

Please sign in to comment.