From a9c79dbb1f8cef409b52835a3d5ee21069434f4c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 31 Oct 2014 00:01:02 -0700
Subject: 1.6.1

---
 RELEASES.md             | 2 ++
 lib/leap_cli/version.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASES.md b/RELEASES.md
index a8de1a0..f8407c0 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -3,6 +3,8 @@ Version 1.6.1
   - support both rsa and ecdsa host keys
   - custom puppet modules: drop modules in files/puppet/modules
   - all json macros are now moved to the platform
+  - allow "+key" and "-key" json properties for adding and subtracting
+    arrays during inheritence
   - bugfix: better CSR creation
   - bugfix: always sort arrays in exported json.
   - bugfix: improved cert updating
diff --git a/lib/leap_cli/version.rb b/lib/leap_cli/version.rb
index 80c9d3f..0248036 100644
--- a/lib/leap_cli/version.rb
+++ b/lib/leap_cli/version.rb
@@ -1,7 +1,7 @@
 module LeapCli
   unless defined?(LeapCli::VERSION)
-    VERSION = '1.6.0'
-    COMPATIBLE_PLATFORM_VERSION = '0.5.3'..'1.99'
+    VERSION = '1.6.1'
+    COMPATIBLE_PLATFORM_VERSION = '0.6.0'..'1.99'
     SUMMARY = 'Command line interface to the LEAP platform'
     DESCRIPTION = 'The command "leap" can be used to manage a bevy of servers running the LEAP platform from the comfort of your own home.'
     LOAD_PATHS = ['lib', 'vendor/certificate_authority/lib', 'vendor/rsync_command/lib']
-- 
cgit v1.2.3