Skip to content

Commit

Permalink
Merge pull request #116 from jmpsec/v0.2.4
Browse files Browse the repository at this point in the history
Cutting v0.2.4
  • Loading branch information
javuto authored Dec 23, 2020
2 parents c67aa74 + 1729087 commit 875c9dd
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 42 deletions.
24 changes: 12 additions & 12 deletions admin/handlers/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ require (
github.com/gorilla/mux v1.7.4
github.com/gorilla/sessions v1.2.0 // indirect
github.com/jinzhu/gorm v1.9.12
github.com/jmpsec/osctrl/admin/sessions v0.2.3
github.com/jmpsec/osctrl/carves v0.2.3
github.com/jmpsec/osctrl/environments v0.2.3
github.com/jmpsec/osctrl/logging v0.2.3
github.com/jmpsec/osctrl/metrics v0.2.3
github.com/jmpsec/osctrl/nodes v0.2.3
github.com/jmpsec/osctrl/queries v0.2.3
github.com/jmpsec/osctrl/settings v0.2.3
github.com/jmpsec/osctrl/tags v0.2.3
github.com/jmpsec/osctrl/types v0.2.3
github.com/jmpsec/osctrl/users v0.2.3
github.com/jmpsec/osctrl/utils v0.2.3
github.com/jmpsec/osctrl/admin/sessions v0.2.4
github.com/jmpsec/osctrl/carves v0.2.4
github.com/jmpsec/osctrl/environments v0.2.4
github.com/jmpsec/osctrl/logging v0.2.4
github.com/jmpsec/osctrl/metrics v0.2.4
github.com/jmpsec/osctrl/nodes v0.2.4
github.com/jmpsec/osctrl/queries v0.2.4
github.com/jmpsec/osctrl/settings v0.2.4
github.com/jmpsec/osctrl/tags v0.2.4
github.com/jmpsec/osctrl/types v0.2.4
github.com/jmpsec/osctrl/users v0.2.4
github.com/jmpsec/osctrl/utils v0.2.4
)

replace github.com/jmpsec/osctrl/carves => ../../carves
Expand Down
2 changes: 1 addition & 1 deletion admin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const (
// Service name
serviceName string = projectName + "-" + settings.ServiceAdmin
// Service version
serviceVersion string = "0.2.3"
serviceVersion string = "0.2.4"
// Service description
serviceDescription string = "Admin service for osctrl"
// Application description
Expand Down
2 changes: 1 addition & 1 deletion api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const (
// Service name
serviceName string = projectName + "-" + settings.ServiceAPI
// Service version
serviceVersion string = "0.2.3"
serviceVersion string = "0.2.4"
// Service description
serviceDescription string = "API service for osctrl"
// Application description
Expand Down
2 changes: 1 addition & 1 deletion cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
// Application name
appName string = projectName + "-cli"
// Application version
appVersion string = "0.2.3"
appVersion string = "0.2.4"
// Application usage
appUsage string = "CLI for " + projectName
// Application description
Expand Down
30 changes: 15 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ require (
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/gorilla/mux v1.7.4
github.com/jinzhu/gorm v1.9.12
github.com/jmpsec/osctrl/admin/handlers v0.2.3
github.com/jmpsec/osctrl/admin/sessions v0.2.3
github.com/jmpsec/osctrl/backend v0.2.3
github.com/jmpsec/osctrl/carves v0.2.3
github.com/jmpsec/osctrl/environments v0.2.3
github.com/jmpsec/osctrl/logging v0.2.3
github.com/jmpsec/osctrl/metrics v0.2.3
github.com/jmpsec/osctrl/nodes v0.2.3
github.com/jmpsec/osctrl/queries v0.2.3
github.com/jmpsec/osctrl/settings v0.2.3
github.com/jmpsec/osctrl/tags v0.2.3
github.com/jmpsec/osctrl/tls/handlers v0.2.3
github.com/jmpsec/osctrl/types v0.2.3
github.com/jmpsec/osctrl/users v0.2.3
github.com/jmpsec/osctrl/utils v0.2.3
github.com/jmpsec/osctrl/admin/handlers v0.2.4
github.com/jmpsec/osctrl/admin/sessions v0.2.4
github.com/jmpsec/osctrl/backend v0.2.4
github.com/jmpsec/osctrl/carves v0.2.4
github.com/jmpsec/osctrl/environments v0.2.4
github.com/jmpsec/osctrl/logging v0.2.4
github.com/jmpsec/osctrl/metrics v0.2.4
github.com/jmpsec/osctrl/nodes v0.2.4
github.com/jmpsec/osctrl/queries v0.2.4
github.com/jmpsec/osctrl/settings v0.2.4
github.com/jmpsec/osctrl/tags v0.2.4
github.com/jmpsec/osctrl/tls/handlers v0.2.4
github.com/jmpsec/osctrl/types v0.2.4
github.com/jmpsec/osctrl/users v0.2.4
github.com/jmpsec/osctrl/utils v0.2.4
github.com/olekukonko/tablewriter v0.0.4
github.com/spf13/viper v1.6.2
github.com/urfave/cli v1.22.4
Expand Down
2 changes: 1 addition & 1 deletion osctrl-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ servers:
info:
title: osctrl-api
description: 'This the API for osctrl, a fast and efficient osquery management solution.'
version: 0.2.3
version: 0.2.4
externalDocs:
description: osctrl documentation (https://osctrl.net)
url: https://osctrl.net
Expand Down
20 changes: 10 additions & 10 deletions tls/handlers/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ go 1.15

require (
github.com/gorilla/mux v1.6.2
github.com/jmpsec/osctrl/carves v0.2.3
github.com/jmpsec/osctrl/environments v0.2.3
github.com/jmpsec/osctrl/logging v0.2.3
github.com/jmpsec/osctrl/metrics v0.2.3
github.com/jmpsec/osctrl/nodes v0.2.3
github.com/jmpsec/osctrl/queries v0.2.3
github.com/jmpsec/osctrl/settings v0.2.3
github.com/jmpsec/osctrl/tags v0.2.3
github.com/jmpsec/osctrl/types v0.2.3
github.com/jmpsec/osctrl/utils v0.2.3
github.com/jmpsec/osctrl/carves v0.2.4
github.com/jmpsec/osctrl/environments v0.2.4
github.com/jmpsec/osctrl/logging v0.2.4
github.com/jmpsec/osctrl/metrics v0.2.4
github.com/jmpsec/osctrl/nodes v0.2.4
github.com/jmpsec/osctrl/queries v0.2.4
github.com/jmpsec/osctrl/settings v0.2.4
github.com/jmpsec/osctrl/tags v0.2.4
github.com/jmpsec/osctrl/types v0.2.4
github.com/jmpsec/osctrl/utils v0.2.4
github.com/segmentio/ksuid v1.0.2
github.com/stretchr/testify v1.5.1
)
Expand Down
2 changes: 1 addition & 1 deletion tls/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const (
// Service name
serviceName string = projectName + "-" + settings.ServiceTLS
// Service version
serviceVersion string = "0.2.3"
serviceVersion string = "0.2.4"
// Service description
serviceDescription string = "TLS service for osctrl"
// Application description
Expand Down

0 comments on commit 875c9dd

Please sign in to comment.