aaa #1

Open

yangwanyuan wants to merge 50 commits intohum1:masterfrom

yangwanyuan:master

Commits on Apr 7, 2015

x
ywy
committed
modified api to increase mana_monitor interface
ywy
committed
Delete conf.py.bak
yangwanyuan
committed

Commits on Apr 8, 2015

commplete send mail to receivers
yangwanyuan
committed
Delete data
yangwanyuan
committed

Commits on Apr 9, 2015

modify api interface to get instance
yangwanyuan
committed
Merge branch 'master' of https://github.com/yangwanyuan/mana
yangwanyuan
committed
modify the monitor send messeges
yangwanyuan
committed

Commits on Apr 10, 2015

modify the bin script
root
committed
modify the api interface to get project and user
root
committed
modify the debug machine on ywy host
root
committed
modify add monitor time
root
committed
Delete mana.sh
yangwanyuan
committed
Delete mana-monitor
yangwanyuan
committed
fix etc
root
committed
Merge branch 'master' of https://github.com/yangwanyuan/mana
root
committed
modified +x
root
committed
modify start stop script
root
committed
add centos script
root
committed
modify email chinese code
root
committed
modify code utf-8
root
committed

Commits on Apr 13, 2015

fix project and user in chinese
root
committed
fix
root
committed
add try
root
committed
fix
root
committed

Commits on Apr 14, 2015

fix encode latin-1 from mysql , abandon django_db
root
committed
fix mana_monitor.py use utf-8
root
committed
fix some bug
root
committed
126 user and password
root
committed
add ztgame_work@126.com
root
committed

Commits on Apr 15, 2015

add SMS and modify some code archite
root
committed

Commits on Apr 16, 2015

complete sms
root
committed
fix sms data and network unit
root
committed
fix network sms bug
root
committed
fix some bug
root
committed
fix some too long code
root
committed
fix long code
root
committed
fix Mbits
root
committed
fix B to bit
root
committed

Commits on Apr 20, 2015

Commits on Apr 29, 2015

delete alarm
root
committed
add api url:/api/statics/<region>/<Meteric>/<UUID>/seconds/<time>/
root
committed

Commits on May 5, 2015

fix tab to space, fix instance reboot limit network bug
root
committed
revert limit network
root
committed

Commits on May 8, 2015

add api for client alarm
root
committed
add build and etc file
root
committed

Commits on May 19, 2015

fix bug
yangwanyuan
committed