Return-Path: X-Original-To: apmail-incubator-deltacloud-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0821B6091 for ; Thu, 9 Jun 2011 12:56:24 +0000 (UTC) Received: (qmail 75582 invoked by uid 500); 9 Jun 2011 12:56:24 -0000 Delivered-To: apmail-incubator-deltacloud-commits-archive@incubator.apache.org Received: (qmail 75566 invoked by uid 500); 9 Jun 2011 12:56:24 -0000 Mailing-List: contact deltacloud-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-commits@incubator.apache.org Received: (qmail 75559 invoked by uid 99); 9 Jun 2011 12:56:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2011 12:56:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2011 12:56:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E4FDC2388A3D; Thu, 9 Jun 2011 12:56:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1133844 - /incubator/deltacloud/trunk/server/server.rb Date: Thu, 09 Jun 2011 12:56:00 -0000 To: deltacloud-commits@incubator.apache.org From: lutter@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110609125600.E4FDC2388A3D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lutter Date: Thu Jun 9 12:56:00 2011 New Revision: 1133844 URL: http://svn.apache.org/viewvc?rev=1133844&view=rev Log: load_balancers (register, unregister): respond with 204 for XML/JSON Modified: incubator/deltacloud/trunk/server/server.rb Modified: incubator/deltacloud/trunk/server/server.rb URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1133844&r1=1133843&r2=1133844&view=diff ============================================================================== --- incubator/deltacloud/trunk/server/server.rb (original) +++ incubator/deltacloud/trunk/server/server.rb Thu Jun 9 12:56:00 2011 @@ -327,7 +327,11 @@ collection :load_balancers do param :instance_id, :string, :required control do driver.lb_register_instance(credentials, params) - redirect(load_balancer_url(params[:id])) + respond_to do |format| + format.xml { 204 } + format.json { 204 } + format.html { redirect(load_balancer_url(params[:id])) } + end end end @@ -337,7 +341,11 @@ collection :load_balancers do param :instance_id, :string, :required control do driver.lb_unregister_instance(credentials, params) - redirect(load_balancer_url(params[:id])) + respond_to do |format| + format.xml { 204 } + format.json { 204 } + format.html { redirect(load_balancer_url(params[:id])) } + end end end