Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

添加 alert . mlog ,修改引用 #1742

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

添加 alert . mlog ,修改引用 #1742

wants to merge 7 commits into from

Commits on Oct 25, 2017

  1. 添加 alert . mlog ,修改引用

    yozora committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    c15a5c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2017

  1. Delete kapacitor.iml

    delete
    yozora-hitagi committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    d8a2fe4 View commit details
    Browse the repository at this point in the history
  2. Delete modules.xml

    delete
    yozora-hitagi committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    51f4d9c View commit details
    Browse the repository at this point in the history
  3. Delete vcs.xml

    delete
    yozora-hitagi committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    3aa102d View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' of https://github.com/influxdata/kapacitor

    # Conflicts:
    #	autoscale.go
    #	http_post.go
    #	integrations/streamer_test.go
    #	pipeline/combine.go
    #	pipeline/k8s_autoscale.go
    #	pipeline/state_tracking.go
    #	pipeline/stream.go
    #	pipeline/swarm_autoscale.go
    #	pipeline/udf.go
    #	pipeline/where.go
    #	server/server.go
    #	server/server_helper_test.go
    #	services/diagnostic/handlers.go
    #	services/ec2/service.go
    #	services/httppost/service.go
    #	task_master.go
    yozora committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    4b76f5e View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/master'

    yozora committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    24e7d3d View commit details
    Browse the repository at this point in the history
  6. to influxdata

    yozora committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    6de5256 View commit details
    Browse the repository at this point in the history