diff options
author | elijah <elijah@riseup.net> | 2015-05-05 15:49:07 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-05-05 15:49:07 -0700 |
commit | 6c6b5a88f18f714924530d64486cb88c02bd7ee4 (patch) | |
tree | 3a663822de4c279da8287db04f0a42cfb2c407fb /test | |
parent | 51195b20531c4dcdf6a76e6a9a8ef7a771cf76be (diff) | |
parent | 61fdf41087b480db12720df5d5beadd32992475a (diff) |
Merge branch 'develop'
Conflicts:
lib/leap_cli/commands/db.rb
lib/leap_cli/commands/vagrant.rb
Diffstat (limited to 'test')
-rw-r--r-- | test/leap_platform/platform.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/leap_platform/platform.rb b/test/leap_platform/platform.rb index d93f59c..57ea980 100644 --- a/test/leap_platform/platform.rb +++ b/test/leap_platform/platform.rb @@ -4,8 +4,8 @@ # Leap::Platform.define do - self.version = "0.6.0" - self.compatible_cli = "1.5.8".."1.99" + self.version = "0.7.0" + self.compatible_cli = "1.7.0".."1.7.99" # # the facter facts that should be gathered |