merge

duzhanyuan · May 12, 2016 · a5175bf · a5175bf
2 parents 6ef04ea + ed1c562
commit a5175bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -23,8 +23,11 @@ _testmain.go
 *.test
 *.prof
 *.gitattributes
+<<<<<<< HEAD
 
 *.iml
 *.ipr
 *.iws
 .idea/
+=======
+>>>>>>> startfeng/master
diff --git a/ops/runserver.py b/ops/runserver.py
@@ -0,0 +1,7 @@
+# -*- encoding: utf8 -*-
+
+import views
+from commons import *
+
+
+app.run(host = '0.0.0.0', port = 9000, debug = True)
diff --git a/store/store.toml b/store/store.toml
@@ -71,7 +71,7 @@ ServerId  = "47E273ED-CD3A-4D6A-94CE-554BA9B195EB"
 
 # zookeeper cluster addrs
 Addrs = [
-    "192.168.1.192:2181"
+    "localhost:2181"
 ]
 
 # zookeeper heartbeat timeout.