Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vintagewang
vintagewang committed Dec 4, 2013
2 parents bff1da3 + 9fd80a8 commit 196f724
Show file tree
Hide file tree
Showing 45 changed files with 780 additions and 1,411 deletions.
2 changes: 1 addition & 1 deletion bin/mqadmin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<options>
<-Xms512m></-Xms512m>
<-Xmx2g></-Xmx2g>
<-Xmx1g></-Xmx1g>
<-XX:NewSize>256M</-XX:NewSize>
<-XX:MaxNewSize>512M</-XX:MaxNewSize>
<-XX:PermSize>128M</-XX:PermSize>
Expand Down
2 changes: 1 addition & 1 deletion bin/mqbroker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<options>
<-Xms512m></-Xms512m>
<-Xmx2g></-Xmx2g>
<-Xmx1g></-Xmx1g>
<-XX:NewSize>256M</-XX:NewSize>
<-XX:MaxNewSize>512M</-XX:MaxNewSize>
<-XX:PermSize>128M</-XX:PermSize>
Expand Down
2 changes: 1 addition & 1 deletion bin/mqnamesrv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<options>
<-Xms512m></-Xms512m>
<-Xmx2g></-Xmx2g>
<-Xmx1g></-Xmx1g>
<-XX:NewSize>256M</-XX:NewSize>
<-XX:MaxNewSize>512M</-XX:MaxNewSize>
<-XX:PermSize>128M</-XX:PermSize>
Expand Down
7 changes: 7 additions & 0 deletions conf/2m-2s-async/broker-a-s.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-a
brokerId=1
deleteWhen=04
fileReservedTime=48
brokerRole=SLAVE
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-async/broker-a.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-a
brokerId=0
deleteWhen=04
fileReservedTime=48
brokerRole=ASYNC_MASTER
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-async/broker-b-s.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-b
brokerId=1
deleteWhen=04
fileReservedTime=48
brokerRole=SLAVE
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-async/broker-b.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-b
brokerId=0
deleteWhen=04
fileReservedTime=48
brokerRole=ASYNC_MASTER
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-sync/broker-a-s.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-a
brokerId=1
deleteWhen=04
fileReservedTime=48
brokerRole=SLAVE
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-sync/broker-a.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-a
brokerId=0
deleteWhen=04
fileReservedTime=48
brokerRole=SYNC_MASTER
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-sync/broker-b-s.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-b
brokerId=1
deleteWhen=04
fileReservedTime=48
brokerRole=SLAVE
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-2s-sync/broker-b.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-b
brokerId=0
deleteWhen=04
fileReservedTime=48
brokerRole=SYNC_MASTER
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-noslave/broker-a.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-a
brokerId=0
deleteWhen=04
fileReservedTime=48
brokerRole=ASYNC_MASTER
flushDiskType=ASYNC_FLUSH
7 changes: 7 additions & 0 deletions conf/2m-noslave/broker-b.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
brokerClusterName=DefaultCluster
brokerName=broker-b
brokerId=0
deleteWhen=04
fileReservedTime=48
brokerRole=ASYNC_MASTER
flushDiskType=ASYNC_FLUSH
2 changes: 1 addition & 1 deletion develop.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export JAVA_HOME=/opt/taobao/java
export PATH=/opt/taobao/mvn/bin:$JAVA_HOME/bin:$PATH
mvn -Dmaven.test.skip=true clean package install assembly:assembly -U

ln -s target/alibaba-rocketmq-3.0.4.dir/alibaba-rocketmq devenv
ln -s target/alibaba-rocketmq-3.0.5.dir/alibaba-rocketmq devenv
2 changes: 1 addition & 1 deletion install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export JAVA_HOME=/opt/taobao/java
export PATH=/opt/taobao/mvn/bin:$JAVA_HOME/bin:$PATH
mvn -Dmaven.test.skip=true clean package install assembly:assembly -U

ln -s target/alibaba-rocketmq-3.0.4.dir/alibaba-rocketmq devenv
ln -s target/alibaba-rocketmq-3.0.5.dir/alibaba-rocketmq devenv
Loading

0 comments on commit 196f724

Please sign in to comment.