[or]operator is deprecated in ocaml4
Merge pull request #512 from kumagi/master

hotfix: [or] operator is deprecated in ocaml4
Merge branch 'release/0.5.0'
re-enable gcc and master test in Travis CI (related #120)
Fix mixer; it should be noncopyable
Fix linear_mixer SEGVing when stop() is not called
Fix push_mixer
Add get_status to proxy
Add get_proxy_status to client
Merge branch 'develop' into get_proxy_status

Conflicts:
	jubatus/server/framework/proxy_common.cpp
Fix for cpplint
set not `obsolete` in case launched alone
Merge pull request #608 from gintenlabo/fix-segv-when-failed-to-create-zk

Fix SEGV when zk create has been failed (fixes #483, #484)
add #include <string> where it uses std::string
Merge branch 'develop' of github.com:jubatus/jubatus into develop
Merge branch 'get_proxy_status' of github.com:rimms/jubatus into rimms-get_proxy_status
Merge pull request #612 from rimms/get_proxy_status

Add get_status to proxy
common::util is deprecated
Merge branch 'develop' of github.com:jubatus/jubatus into rimms-get_proxy_status
Merge https://github.com/jubatus/jubatus into develop