Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 41856FA09 for ; Thu, 28 Mar 2013 19:06:44 +0000 (UTC) Received: (qmail 71243 invoked by uid 500); 28 Mar 2013 19:05:39 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 69393 invoked by uid 500); 28 Mar 2013 19:05:37 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Delivered-To: moderator for dev@deltacloud.apache.org Received: (qmail 16294 invoked by uid 99); 28 Mar 2013 17:16:26 -0000 From: tomassedovic To: dev@deltacloud.apache.org Subject: deltacloud pull request: Rebase and fixup for the 396 networking patchset Content-Type: text/plain Message-Id: <20130328171626.00063833285@tyr.zones.apache.org> Date: Thu, 28 Mar 2013 17:16:25 +0000 (UTC) GitHub user tomassedovic opened a pull request: https://github.com/apache/deltacloud/pull/6 Rebase and fixup for the 396 networking patchset Recent changes in the master made the networking patches sent by @marios[1] incompatible. This is a rebase of those patches against the master plus a few fixes so that listing networks and subnets as application/xml works properly. [1]: http://tracker.deltacloud.org/set/396 You can merge this pull request into a Git repository by running: $ git pull https://github.com/tomassedovic/deltacloud networking Alternatively you can review and apply these changes as the patch at: https://github.com/apache/deltacloud/pull/6.patch ---- commit 30ae41972eb8d5ab62a579e7d51c2f797707a3d9 Author: marios Date: 2013-03-21T19:18:21Z Network API rev 2 (RFC) - Models Signed-off-by: marios TrackedAt: http://tracker.deltacloud.org/patch/9884a9fb9762cc8cfb11822b83245d3132d27f92 commit 455773d8beb45e2d9d9c6a6dadbd5b1d33688cd4 Author: marios Date: 2013-03-21T19:19:28Z Network API rev 2 (RFC) - Collections (Routes) Signed-off-by: marios TrackedAt: http://tracker.deltacloud.org/patch/105b1e677962fdaf68c9748f10b1dd7ec20cfbff commit 78b424e5f25639cae4f2d0f46b39c0cc34907267 Author: marios Date: 2013-03-21T19:20:09Z Network API rev 2 (RFC) - Views Signed-off-by: marios TrackedAt: http://tracker.deltacloud.org/patch/58892c140dcc50ece64969d9b4d4f083dba84642 commit 84a7edb13d54238e2e99e4ee0b832f81a101b9ec Author: marios Date: 2013-03-21T19:21:16Z Network API rev 2 (RFC) - YAML for mock driver fixtures Signed-off-by: marios TrackedAt: http://tracker.deltacloud.org/patch/833d540fdac57974da0087994617a69b87f793ba commit 812c276bb610a7e45491de421ae656b568f34dcc Author: marios Date: 2013-03-21T19:21:42Z Network API rev 2 (RFC) - Drivers - Openstack, EC2, mock Signed-off-by: marios TrackedAt: http://tracker.deltacloud.org/patch/900c7d12e5f8607cd29b6b2199a553c7b32a0361 commit dd85e851a9f54e019d7646df712cf0eb5c87b19a Author: Tomas Sedovic Date: 2013-03-28T12:25:07Z Fix the "invalid locals key" error Loading the XML list of networks and subnets caused Tilt to rais an exception: invalid locals key: :@network (keys must be variable names) Renaming `@network` to `network` (and the same for `@subnet`) in the views fixed the problem. Signed-off-by: Tomas Sedovic ----