grim/convey

Merge upstream

2017-09-20, Eric Fritz
e8401b751c4d
Parents a4b424d543a1c75b9de2a113
Children 80dcf627accf
Merge upstream
4 files changed, 7 insertions(+), 3 deletions(-)
  • +1 -0
    .hgtags
  • +4 -1
    ChangeLog
  • +1 -1
    convey.yml
  • +1 -1
    main.go
    • --- a/.hgtags Wed Sep 20 19:12:43 2017 -0500
    +++ b/.hgtags Wed Sep 20 19:17:14 2017 -0500
    @@ -9,3 +9,4 @@
    58d0d52a51b278d586c5bede84a2c300c3855dde v0.6.0
    5561b6335876739fc27a588a6f3683637b9c9643 v0.7.0
    48e8fd45b85665b7d1f9b53b67f7084c18d48617 v0.8.0
    +2e75ab88da21edadfc9a00f1ed0f311bfcf5c95b v0.9.0
    --- a/ChangeLog Wed Sep 20 19:12:43 2017 -0500
    +++ b/ChangeLog Wed Sep 20 19:17:14 2017 -0500
    @@ -1,4 +1,7 @@
    -0.9.0:
    +0.9.1:
    + * Nothing yet... Be the first!!
    +
    +0.9.0: 20170917
    * Updated the import and export tasks to allow a string for the files field
    to specify a single item.
    * Grammatical updates to README.md (Anatzum)
    --- a/convey.yml Wed Sep 20 19:12:43 2017 -0500
    +++ b/convey.yml Wed Sep 20 19:17:14 2017 -0500
    @@ -1,5 +1,5 @@
    environment:
    - - CONVEY_VERSION=0.9.0dev
    + - CONVEY_VERSION=0.9.1dev
    - GO_PACKAGE=bitbucket.org/rw_grim/convey
    tasks:
    # tasks for the default plan
    --- a/main.go Wed Sep 20 19:12:43 2017 -0500
    +++ b/main.go Wed Sep 20 19:17:14 2017 -0500
    @@ -36,7 +36,7 @@
    )
    const (
    - version = "0.9.0dev"
    + version = "0.9.1dev"
    )
    var (