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

Merge Develop to Master #6

Merged
merged 6 commits into from
Oct 17, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
some delinting
  • Loading branch information
egeland committed Oct 14, 2016
commit 10f70a1eab57df88addea0a1aa88328b8502592b
4 changes: 2 additions & 2 deletions flywheel.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/aws/aws-sdk-go/service/ec2"
)

// How often flywheel will update its internal state and/or check for idle
// timeouts
// SpinINTERVAL determines how often flywheel will update its
// internal state and/or check for idle timeouts
const SpinINTERVAL = time.Second

// Ping - HTTP requests "ping" the flywheel goroutine. This updates the idle timeout,
Expand Down
1 change: 1 addition & 0 deletions healthcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/aws/aws-sdk-go/service/ec2"
)

// Status keeps track of the status
type Status uint

// Different state of the systems
Expand Down
4 changes: 2 additions & 2 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
)

// The git commit that was compiled. This will be filled in by the compiler.
// GitCommit - The git commit that was compiled. This will be filled in by the compiler.
var GitCommit string

// Version shoul be overwritten via Makefile
// Version should be overwritten via Makefile
const Version = "0.2.0"

// VersionInfo stores version and GitCommit SHA
Expand Down