Commit 683c099c authored by Gari Singh's avatar Gari Singh Committed by Gerrit Code Review
Browse files

Merge "Prepare fabric for 1.3 development"

parents 1c3296c3 db587674
......@@ -43,10 +43,10 @@
# - docker-tag-latest - re-tags the images made by 'make docker' with the :latest tag
# - help-docs - generate the command reference docs
BASE_VERSION = 1.2.0
PREV_VERSION = 1.2.0-rc1
BASE_VERSION = 1.3.0
PREV_VERSION = 1.2.0
CHAINTOOL_RELEASE=1.1.1
BASEIMAGE_RELEASE=0.4.8
BASEIMAGE_RELEASE=0.4.10
# Allow to build as a submodule setting the main project to
# the PROJECT_NAME env variable, for example,
......
......@@ -9,7 +9,7 @@ package metadata
// Variables defined by the Makefile and passed in with ldflags
var Version string = "latest"
var CommitSHA string = "development build"
var BaseVersion string = "0.4.8"
var BaseVersion string = "0.4.10"
var BaseDockerLabel string = "org.hyperledger.fabric"
var DockerNamespace string = "hyperledger"
var BaseDockerNamespace string = "hyperledger"
......
......@@ -10,6 +10,7 @@ import (
"net"
"net/http"
_ "net/http/pprof" // This is essentially the main package for the orderer
"os"
"time"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment