diff --git a/Makefile b/Makefile
diff --git a/VERSION b/VERSION
diff --git a/cli/Makefile b/cli/Makefile
diff --git a/cli/feast/cmd/apply.go b/cli/feast/cmd/apply.go
diff --git a/cli/feast/cmd/jobs.go b/cli/feast/cmd/jobs.go
diff --git a/cli/feast/cmd/list.go b/cli/feast/cmd/list.go
diff --git a/cli/feast/cmd/version.go b/cli/feast/cmd/version.go
diff --git a/cli/feast/main.go b/cli/feast/main.go
diff --git a/cli/feast/pkg/parse/yaml.go b/cli/feast/pkg/parse/yaml.go
diff --git a/cli/feast/pkg/parse/yaml_test.go b/cli/feast/pkg/parse/yaml_test.go
diff --git a/cli/feast/pkg/printer/job.go b/cli/feast/pkg/printer/job.go
diff --git a/core/src/main/proto b/core/src/main/proto
diff --git a/core/src/main/proto/feast b/core/src/main/proto/feast
diff --git a/core/src/main/proto/third_party b/core/src/main/proto/third_party
diff --git a/ingestion/src/main/proto b/ingestion/src/main/proto
diff --git a/ingestion/src/main/proto/feast b/ingestion/src/main/proto/feast
diff --git a/ingestion/src/main/proto/third_party b/ingestion/src/main/proto/third_party
diff --git a/protos/feast/core/CoreService.proto b/protos/feast/core/CoreService.proto
diff --git a/protos/feast/core/JobService.proto b/protos/feast/core/JobService.proto
diff --git a/protos/feast/core/UIService.proto b/protos/feast/core/UIService.proto
diff --git a/protos/feast/serving/Serving.proto b/protos/feast/serving/Serving.proto
diff --git a/protos/feast/specs/EntitySpec.proto b/protos/feast/specs/EntitySpec.proto
diff --git a/protos/feast/specs/FeatureGroupSpec.proto b/protos/feast/specs/FeatureGroupSpec.proto
diff --git a/protos/feast/specs/FeatureSpec.proto b/protos/feast/specs/FeatureSpec.proto
diff --git a/protos/feast/specs/ImportSpec.proto b/protos/feast/specs/ImportSpec.proto
diff --git a/protos/feast/specs/StorageSpec.proto b/protos/feast/specs/StorageSpec.proto
diff --git a/protos/feast/storage/BigTable.proto b/protos/feast/storage/BigTable.proto
diff --git a/protos/feast/storage/Redis.proto b/protos/feast/storage/Redis.proto
diff --git a/protos/feast/types/Feature.proto b/protos/feast/types/Feature.proto
diff --git a/protos/feast/types/FeatureRow.proto b/protos/feast/types/FeatureRow.proto
diff --git a/protos/feast/types/FeatureRowExtended.proto b/protos/feast/types/FeatureRowExtended.proto
diff --git a/protos/feast/types/Granularity.proto b/protos/feast/types/Granularity.proto
diff --git a/protos/feast/types/Value.proto b/protos/feast/types/Value.proto
Original file line number	Diff line number	Diff line change
		@@ -1,15 +1,16 @@
		.PHONY: go
		VERSION_FILE=VERSION
		FEAST_VERSION=`cat $(VERSION_FILE)`

		build-deps:
		$(MAKE) -C protos gen-go
		dep ensure

		build-cli:
		$(MAKE) build-deps
		$(MAKE) -C cli build-all

		install-cli:
		@$(MAKE) build-deps
		cd cli/feast && go install
		build-java:
		mvn clean verify -Drevision=$(FEAST_VERSION)

		build-docker:
		docker build -t $(registry)/feast-core:$(version) -f docker/core/Dockerfile .
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,6 @@
		.PHONY: go
		VERSION_FILE=../VERSION
		FEAST_VERSION=`cat $(VERSION_FILE)`

		build-all:
		@$(MAKE) cli-linux cli-darwin
Expand All		@@ -8,10 +10,14 @@ cli-linux:
		mkdir -p bin
		export GOOS=linux; \
		export GOARCH=amd64; \
		mkdir -p bin/$$GOOS-$$GOARCH && go build -o bin/$$GOOS-$$GOARCH/feast feast/main.go
		mkdir -p bin/$$GOOS-$$GOARCH && go build \
		-ldflags "-X main.Version=$(FEAST_VERSION)" \
		-o bin/$$GOOS-$$GOARCH/feast feast/main.go

		.PHONY: cli-darwin
		cli-darwin:
		export GOOS=darwin; \
		export GOARCH=amd64; \
		mkdir -p bin/$$GOOS-$$GOARCH && go build -o bin/$$GOOS-$$GOARCH/feast feast/main.go
		mkdir -p bin/$$GOOS-$$GOARCH && go build \
		-ldflags "-X main.Version=$(FEAST_VERSION)" \
		-o bin/$$GOOS-$$GOARCH/feast feast/main.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,7 @@ import (
		"path/filepath"

		"github.com/gojektech/feast/cli/feast/pkg/parse"
		"github.com/gojektech/feast/go-feast-proto/feast/core"
		"github.com/gojektech/feast/protos/generated/go/feast/core"

		"github.com/spf13/cobra"
		)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,7 +23,7 @@ import (
		"text/tabwriter"

		"github.com/gojektech/feast/cli/feast/pkg/util"
		"github.com/gojektech/feast/go-feast-proto/feast/core"
		"github.com/gojektech/feast/protos/generated/go/feast/core"

		"github.com/golang/protobuf/ptypes/empty"
		"github.com/spf13/cobra"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,16 +20,22 @@ import (
		"github.com/spf13/cobra"
		)

		var version = "0.3.0"
		// Version is the cli version, injected at compile time
		var version string

		var versionCmd = &cobra.Command{
		Use: "version",
		Short: "feast cli version",
		Run: func(cmd *cobra.Command, args []string) {
		fmt.Printf("CLI version: %s\n", version)
		fmt.Println(version)
		},
		}

		func init() {
		rootCmd.AddCommand(versionCmd)
		}

		// SetVersion sets the version to the given version.
		func SetVersion(v string) {
		version = v
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,8 +14,14 @@

		package main

		import "github.com/gojektech/feast/cli/feast/cmd"
		import (
		"github.com/gojektech/feast/cli/feast/cmd"
		)

		// Version is the Feast version
		var Version string

		func main() {
		cmd.SetVersion(Version)
		cmd.Execute()
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,8 +23,8 @@ import (

		"github.com/ghodss/yaml"

		"github.com/gojektech/feast/go-feast-proto/feast/specs"
		"github.com/gojektech/feast/go-feast-proto/feast/types"
		"github.com/gojektech/feast/protos/generated/go/feast/specs"
		"github.com/gojektech/feast/protos/generated/go/feast/types"
		)

		// YamlToFeatureSpec parses the given yaml and outputs the corresponding
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,8 +19,8 @@ import (

		"github.com/golang/protobuf/ptypes/timestamp"

		"github.com/gojektech/feast/go-feast-proto/feast/specs"
		"github.com/gojektech/feast/go-feast-proto/feast/types"
		"github.com/gojektech/feast/protos/generated/go/feast/specs"
		"github.com/gojektech/feast/protos/generated/go/feast/types"

		"github.com/google/go-cmp/cmp"
		)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,7 +19,7 @@ import (
		"strings"

		"github.com/gojektech/feast/cli/feast/pkg/util"
		"github.com/gojektech/feast/go-feast-proto/feast/core"
		"github.com/gojektech/feast/protos/generated/go/feast/core"
		)

		// PrintJobDetail pretty prints the given job detail
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,7 +26,7 @@ import "google/protobuf/empty.proto";

		option java_package = "feast.core";
		option java_outer_classname = "CoreServiceProto";
		option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
		option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";

		service CoreService {
		/*
Expand Down