knife-ec-backup 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb5963efae70a51a2f7e1c7668040a474387b4e
-  data.tar.gz: be734d4f4c46e9034e1dc11cb7765ad54e9cbf45
+  metadata.gz: b1fa04532a43b013c1d7e6f535f6245959c34b88
+  data.tar.gz: 219c74741df411d3072e0927259337972ce69b7e
 SHA512:
-  metadata.gz: f37485fee5ddbde8c0478b7f7ff7a7420d970da080ceb237fbc55922ae4e185c4f9d3e215b1479d10a5c19d550f3469d67459476a3f1475235494faf4c34304e
-  data.tar.gz: 7a2883b1e6bab1a4450357604ec120946c99cd06f2631fa1bef08897fd0acd38bebc49434c42bf82c4c6103183040942b7ee8c3a223e4c1489d94de070f5dbcf
+  metadata.gz: c85f85e6984ee20d7d87471ff5926df00ae82b834dd8a31242d0ac11e8e44b3bc174090c45676230a2d1005b78e87221223fda79d89e655e7394ede761d829c1
+  data.tar.gz: e2c99033987ecf7e5040c529a0f509b17efc5141d889962537eca3160a3927347d11bf468b4183c9edb52111141a2ee529ce0c6aab755594351a369b2c347f2a

data/README.md

@@ -37,8 +37,6 @@ It is recommended that you run this from a frontend Enterprise Chef Server, you
 
 *Options*
 
-  * `--concurrency`:
-    Maximum number of simultaneous requests to send (default: 10)
   * `--webui-key`:
     Used to set the path to the WebUI Key (default: /etc/opscode/webui_priv.pem)
   * `--skip-useracl`:
@@ -102,8 +100,6 @@ This compares very closely with the "knife download /" from an OSC server:
 
 *Options*
 
-  * `--concurrency`:
-    Maximum number of simultaneous requests to send (default: 10)
   * `--webui-key`:
     Used to set the path to the WebUI Key (default: /etc/opscode/webui_priv.pem)
   * `--overwrite-pivotal`:

data/lib/chef/knife/ec_restore.rb

@@ -164,7 +164,7 @@ class Chef
 
           # Restore open invitations
           invitations = JSONCompat.from_json(IO.read("#{dest_dir}/organizations/#{name}/invitations.json"))
-          parallelize(invitations) do |invitation|
+          invitations.each do |invitation|
             begin
               rest.post_rest("organizations/#{name}/association_requests", { 'user' => invitation['username'] })
             rescue Net::HTTPServerException => e
@@ -176,7 +176,7 @@ class Chef
 
           # Repopulate org members
           members = JSONCompat.from_json(IO.read("#{dest_dir}/organizations/#{name}/members.json"))
-          parallelize(members) do |member|
+          members.each do |member|
             username = member['user']['username']
             begin
               response = rest.post_rest("organizations/#{name}/association_requests", { 'user' => username })
@@ -249,7 +249,7 @@ class Chef
           rest = Chef::REST.new(Chef::Config.chef_server_url)
           org_admins = rest.get_rest('groups/admins')['users']
           org_members = rest.get_rest('users').map { |user| user['user']['username'] }
-          org_admins.delete_if { |user| !org_members.include?(user) }
+          org_admins.delete_if { |user| !org_members.include?(user) || user == 'pivotal' }
           if org_admins[0] != nil
             # Using an org admin already on the destination server
             Chef::Config.node_name = org_admins[0]

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec