diff --git a/CHANGELOG.md b/CHANGELOG.md index a02a0ab..a0380d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Change Log All notable changes to this project will be documented in this file. +## Version 1.0.10 - 04/06/2016 +### Added +* Nothing + +### Changed +* Incorporated @wjallen updates and improvements to Agave foundation-cli + +### Removed +* Nothing + ## Version 1.0.9 - 03/09/2016 ### Added * Nothing diff --git a/Makefile b/Makefile index a1ca18c..30c955b 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ sdk_version := $(shell cat VERSION) api_version := v2 api_release := 2.1.6 +api_branch := cyverse TENANT_NAME := 'Cyverse' TENANT_KEY := 'iplantc.org' @@ -21,7 +22,7 @@ all: $(SOURCES) foundation-cli: git-test echo "Fetching foundation-cli source..." if [ ! -d "$(OBJ)" ]; then \ - git clone -q https://bitbucket.org/taccaci/foundation-cli ;\ + git clone -b ${api_branch} -q https://bitbucket.org/taccaci/foundation-cli ;\ rm -rf foundation-cli/.git ;\ cp -R foundation-cli $(OBJ); \ fi diff --git a/VERSION b/VERSION index 66c4c22..7ee7020 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.9 +1.0.10