grim/convey

merging

2018-02-20, Gary Kramlich
bbf13b21ba8d
Parents 47df081c14f87099abe9bf52
Children 166a6d1979fa
merging
3 files changed, 4 insertions(+), 3 deletions(-)
  • +1 -0
    .hgtags
  • +1 -1
    consts/consts.go
  • +2 -2
    convey.yml
    • --- a/.hgtags Tue Feb 20 16:43:51 2018 -0600
    +++ b/.hgtags Tue Feb 20 16:44:10 2018 -0600
    @@ -23,3 +23,4 @@
    7d242a198aa8449a0fe21f82818b2ceb5df30926 v0.13.0
    837098fd33e6b8b2d2891f4baac0bed190e8cc90 v0.13.1
    335eaa5698de94ebd561dd518ee5ad79eabaf7dc v0.14.0-alpha1
    +7078e7170bccc90d3dd61b949f435abe108da980 v0.14.0-alpha2
    --- a/consts/consts.go Tue Feb 20 16:43:51 2018 -0600
    +++ b/consts/consts.go Tue Feb 20 16:44:10 2018 -0600
    @@ -18,5 +18,5 @@
    const (
    // Version is the current version of convey
    - Version = "0.14.0-alpha1"
    + Version = "0.14.0-alpha2"
    )
    --- a/convey.yml Tue Feb 20 16:43:51 2018 -0600
    +++ b/convey.yml Tue Feb 20 16:44:10 2018 -0600
    @@ -1,7 +1,7 @@
    ---
    -required-version: 0.14.0-alpha1
    +required-version: 0.14.0-alpha2
    environment:
    - - CONVEY_VERSION=0.14.0-alpha1
    + - CONVEY_VERSION=0.14.0-alpha2
    - GO_PACKAGE=bitbucket.org/rw_grim/convey
    tasks:
    # tasks for the default plan