commit 3c92c0e065fcbb69ed13a3a8b56c7821dfd0e306
Author: Victor Sergeyev <vsergeyev@mirantis.com>
Date:   Fri Oct 4 11:07:57 2013 +0300

    Add Glance image id to `resource_classes` table
    
    At the moment in Tuskar we have hardcoded (due to Poc) image names
    in the Heat template. We should add possibility to use Glance
    relevant image for a resource class during the resource class
    registration (or modification) process.
    
    This patch brings possibility to accept an image_id parameter as
    part of the resource class model - column `image_id` was added to table
    `resource_classes`.
    
    Tests modified.
    
    Closes-Bug: #1233087
    
    Change-Id: Iad199a9adc9f276fefe4349e373b4e9da2a9fe27

commit 803d2b1350dc92536565049da769818bed476e2b
Merge: 3b47fcc 9a78342
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 22 19:29:44 2013 +0000

    Merge "Add unique constraint to ResourceClass."

commit 3b47fccaaee2427df29e76a6c551248b5c4fe110
Author: marios <marios@redhat.com>
Date:   Thu Oct 17 12:47:58 2013 +0300

    Bug checking for stack existence - catch correct exception
    
    heat client should explicitly catch exception and raise or deal
    
    Closes-Bug: 1240890
    Change-Id: Idb8adf93576dc2e19b0a18d6a7144bd3432e1c56

commit 1b779fcb0c96f83365d2cbde09ab2c752ce44ab3
Merge: da1408c 2608ed3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 19 05:38:41 2013 +0000

    Merge "Naming conflicts for service type from UI"

commit 2608ed36ae5e26e249ff5d703e72816bc7df675a
Author: marios <marios@redhat.com>
Date:   Thu Oct 17 13:57:31 2013 +0300

    Naming conflicts for service type from UI
    
    ui calls the controller resource class 'controller' whereas our
    overcloud.yaml expect 'not_compute' - until naming settles down
    we should carry both otherwise, the notcompute resource doesn't
    show up at all in the generated Heat template
    
    Closes-Bug: 1240896
    Change-Id: I75a3e6cddfef23d3a7be171aa518c2f222b98094

commit da1408cb8fd70d7447a18945ad1de84183ee49ba
Author: Jiri Stransky <jistr@redhat.com>
Date:   Thu Oct 17 14:01:31 2013 +0200

    Fix failing tests on WSME 0.5b6 (failing CI)
    
    The failures had two parts:
    
    * The namespace of errorneous response doesn't contain 'result' key
      anymore, so we have to check for 'faultcode' first and render error
      immediately, before we look for 'result'.
    
    * New WSME has stricter validation and some resources in the tests
      don't pass that. It looks like WSME did not enforce mandatory=True.
      Now it does. Changed to mandatory=False for field "id" in Flavor type
      in tuskar/api/controllers/v1/types/flavor.py b/c we do not need incoming
      request to contain id in body when creating/updating Flavor.
    
    Fixes-Bug: #1240934
    Change-Id: I6a5764a852fd81bc56814840af38a357b7f97d40

commit 9a78342420df526be48b9c9323e259a76914289f
Author: Victor Sergeyev <vsergeyev@mirantis.com>
Date:   Tue Oct 8 16:00:02 2013 +0300

    Add unique constraint to ResourceClass.
    
    When ResourceClass() DB model was added, unique constraint on the 'name'
    column was missed in initial migration script. To fix it, unique constraint,
    `uniq_resource_classes0name` was added.
    Fixed column `name` description tin DB model.
    Added new exceptions - `DuplicateEntry` (should be raised if duplicates
    found) and `ResourceClassExists` - should be raised if user create
    two entries with same name in 'resource_classes' table.
    Functions create_resource_class() and update_resource_class()
    refactored - now they can raise `ResourceClassExists` exception if duplicate
    names in 'resource_classes' table found and use `with` statement for
    work with session.
    Tests added.
    
    Change-Id: I042c54d943b501661e24d9e0ca94574731b23dcf
    Closes-Bug: #1217393

commit e09157464a869ecc80dcb734472b4ade52266e3e
Merge: a164c80 600dded
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 09:01:12 2013 +0000

    Merge "Remove obsolete redhat-eventlet.patch"

commit a164c802a6b12a750fbdb1cdada609b3f8010bd2
Merge: 2613677 01c0f0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 08:35:50 2013 +0000

    Merge "Fix a couple of default config values"

commit 600dded31ead8638218af4e2e27a16213e03f619
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Oct 9 21:53:18 2013 +0100

    Remove obsolete redhat-eventlet.patch
    
    See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gorey details on
    why this exists.
    
    As of this fix:
    
      https://github.com/eventlet/eventlet/pull/34
    
    which was released in eventlet 0.13, we no longer need the patch.
    
    This has now been removed from oslo-incubator, so this is really just
    syncing that removal.
    
    Change-Id: I84267f3c6726cb2e750f615e107c48b12c6ed353

commit 261367783914a6bed47450424e3f10eff9312fcf
Author: Victor Sergeyev <vsergeyev@mirantis.com>
Date:   Tue Oct 8 15:23:08 2013 +0300

    Added indexes and uniques to SQLite
    
    Current change avoid us to test DB indexes and unique constraints on
    SQLite (current DB backend for testing) - initial DB migration
    modified due to add indexes and unique constraints to SQLite backend.
    Tests modified correspondingly.
    
    Change-Id: I84ad2a208e04894d59fe10438de978d53fc582e9

commit 01c0f0f5a8f1e9af105687a7d32e951015f48773
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Mon Oct 7 11:29:20 2013 +0300

    Fix a couple of default config values
    
    The number of options in the config file which must
    be set to run Tuskar should be as small as possible.
    That's why we should choose reasonable default values:
    
        - nova_overcloud_config should be an absolute part
          within /etc/tuskar dir
    
        - username to be passed to Heat client should be
          'admin' rather than 'heat' (it's the admin user
          we are likely to deploy the overcloud on behalf
          of, not heat)
    
    Clarify the meaning of user credentials which are used
    to make requests to Heat API.
    
    Change-Id: I8f94b6fbc3ebbb4d9264b9735b32bb232609ef5d

commit cfc8d44122b5b8a453a73a5b2adaa151828fa16b
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Oct 7 10:28:45 2013 -0400

    Use the python in the virtualenv for everything
    
    Upgrade the tox requirements to match the rest of OpenStack. Benefits
    include not making an sdist first, and ensuring that the virtualenv is
    use for all actions.
    
    Change-Id: Ib0b135e096de0c4ab02278be94898867265c90f9

commit 5d35c18c07f8832156111b49c2a4ee857ca7aca4
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Oct 7 10:27:42 2013 -0400

    Remove distribute dependency
    
    Direct depends on distribute are evil and can break python on entire
    systems in certain combinations.
    
    Change-Id: If96e415e5395f3cbc1babae0fe95b52dc51e5176

commit fa83026a270cf7374b7be1aee3c264f6d53ec5fb
Merge: 1d27f33 223bcb2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 7 09:14:02 2013 +0000

    Merge "Add Heat output params for the overcloud service endpoints"

commit 1d27f33827ac49847372faba247e4ce4e2d2b9ea
Author: Jiri Stransky <jistr@redhat.com>
Date:   Mon Oct 7 10:18:19 2013 +0200

    Update 'stackforge' references to 'openstack'
    
    The project has moved from Stackforge to OpenStack repositories.
    
    Change-Id: If408eaede8338e6035c85894b6f1af86e96024cf

commit 223bcb217e5100a331543353e503f90e4c2f79d3
Author: Imre Farkas <ifarkas@redhat.com>
Date:   Mon Sep 30 14:21:43 2013 +0200

    Add Heat output params for the overcloud service endpoints
    
    Change-Id: I7975ce760d6a8174da1c5fec1f8c2c84369d7b0b
    Partially implements: blueprint heat-overcloud-endpoint-outputs

commit c1ffc35d5686aa4d87d1eaf79b7e74249c90011c
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Oct 5 10:12:08 2013 -0700

    Update repo for move to openstack namespace
    
    .gitreview must be updated to move to the openstack namespace.
    boto==2.5.1 being in the requirements also prevents that change from
    merging.
    
    There is no usage of the boto library anywhere in tuskar. None of the
    binaries that boto ships are executed. It is unclear why boto was even
    added to requirements.txt. Meanwhile we are under stricter global
    requirements due to being moved into the official openstack namespace,
    so having boto==2.5.1 listed here causes our gate to fail.
    
    Change-Id: Ie54f5418dff31caf8f25c01c252839a56747518c

commit ee8443c88517ef0f38e81b72e9ddb821fb8efbf2
Author: Matt Wagner <matt.wagner@redhat.com>
Date:   Tue Sep 17 13:00:39 2013 -0400

    Expose Nodes as a top-level object
    
    Rack information is also shared when fetching node information
    
    Change-Id: I02361a6a89cf3b0bb031732eae893dbd5c0d46ea

commit ba1fd47cc9d866ec8160c4ee3ed0c33e0263a0f2
Merge: 293b628 5287d64
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 07:33:27 2013 +0000

    Merge "Fix initial DB schema migration"

commit 293b62872b55ac32e134cbd2e361ab811a115ddb
Merge: 63417e5 860d346
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 07:31:49 2013 +0000

    Merge "Fix capitalisation of WSME dependency"

commit 63417e5b99de42da9142b20e696c96df5fae21eb
Merge: 41f74ff c6e498f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 07:31:48 2013 +0000

    Merge "Remove d2to1 dependency"

commit 41f74ff30ec183c6cbcb6482050a46a36def1d1b
Merge: ed015d5 a3f5561
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 07:04:56 2013 +0000

    Merge "Switch to PyYAML"

commit a3f5561434c3b35b911899fbbfd56d43924fc71d
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Tue Oct 1 09:51:09 2013 +0200

    Switch to PyYAML
    
    PyYAML is already in OpenStack/requirements and used
    by many other OpenStack projects. simpleyaml might be
    simple but it is an extra dependency only for tuskar.
    
    Change-Id: Ic05c2ca1ebf84cdde157df7200ef6a69146779f4

commit c6e498f3aff865cd98bc0980ca835cb44ea8fb6d
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Sep 30 10:45:06 2013 -0400

    Remove d2to1 dependency
    
    Change-Id: I95c10665bf2846a82c8fc4e161b4c968e1ad6f4f

commit 860d34662b46b886bf7af7a1aff1cdb2e005c4c0
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Sep 27 15:09:08 2013 +0200

    Fix capitalisation of WSME dependency
    
    Also sync minimum version with OpenStack requirements
    
    Change-Id: I69cc77283829ac60d34987a6894a92cefd7655d0

commit ed015d5a04b4afec8fd78e84f9a7e98a23260e45
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Sep 27 15:00:38 2013 +0200

    Adjust home page url
    
    Change-Id: I1fd8d7c150331e9c0ac5a5802432835222660175

commit 2fa7f23752f7dc6faa45a67d1dbf6f54fe110a26
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Tue Sep 24 14:58:19 2013 +0100

    Set default port to 8585
    
    Change-Id: I834be2e4444202aa8ee7eaaeecf26e0ca2f24eef

commit 5287d640f16e3135932e5cd74579c6e1af6765e1
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Mon Sep 23 15:41:21 2013 +0300

    Fix initial DB schema migration
    
    Currently, initial DB schema migration fails on MySQL and
    PostgreSQL due to the following reasons:
    
      - resource_classes and flavors tables are created after ones
        referencing their columns with FKs are created
    
      - lenght of nova_flavor_uuid column (VARCHAR) is not specified
    
    Also, a typo in the name of logger method exception() is fixed.
    
    Change-Id: I4438a836a32860a5695bbf8eb60bd230034e1f98

commit c77822bff387c7f1f7df3c579dae6c8c95203859
Author: Imre Farkas <ifarkas@redhat.com>
Date:   Wed Sep 18 13:24:08 2013 +0200

    Add note on how to update setuptools
    
    Change-Id: I04ec53c473de42b35ad36804056ea92550eebe9c
    Fixes: bug #1212133

commit eb107a7449c34e989dfdbb47f5962044bc96c4f1
Author: Petr Blaho <pblaho@redhat.com>
Date:   Wed Sep 18 14:38:02 2013 +0200

    Fixes errors after WSME updated to 0.5b5
    
    WSME introduces new way of handling errors -
    https://github.com/stackforge/wsme/commit/579772807ef9f1066bb28aa625f01539d2e95825
    
    This changes how we should put errors into Response constructor.
    
    0.5b5 release of WSME contains https://review.openstack.org/#/c/44659/
    so we can drop our workaround https://review.openstack.org/#/c/44689/
    by removing "six" from requirements.txt
    
    Changes response status tests after delete of flavors b/c it now returns
    correct 204.
    
    Minor formatting in renderers.py
    
    Change-Id: I8be35c41b583223f910f8e43be3a225df4d4d4ec

commit 43b53210f522a0478ded8db4abc8b417b0e1841c
Merge: 5f344dc 68c5c49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 9 10:26:07 2013 +0000

    Merge "Update the getting started docs"

commit 68c5c493cf4c6816721f72e69dcd4cc5214e5f5c
Author: Tomas Sedovic <tsedovic@redhat.com>
Date:   Thu Sep 5 14:43:57 2013 +0200

    Update the getting started docs
    
    This moves stuff around a bit (e.g. parts that were in CONTRIBUTING but belong
    to INSTALL), updates the coding process description (we're on Stackforge and
    Launchpad now) and adds some reasonable defaults to the sample config file.
    
    Change-Id: I73e98d54b9df0afb9db7bb95239af78511731d16
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

commit 5f344dc364ff7df3162a3fe84ed2dd5128791aa3
Merge: 2ef0fb2 b113b4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 11:10:38 2013 +0000

    Merge "Adds unit to capacities in curl example"

commit 2ef0fb26b977a48572a7999479c399300f3fa882
Merge: e6d2140 a7a79d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 11:08:37 2013 +0000

    Merge "Temp. fixes wsme problem with six v1.4.0"

commit b113b4d0510b2d3ca4019a4402cb894632eaa6f4
Author: Petr Blaho <pblaho@redhat.com>
Date:   Thu Aug 29 17:51:38 2013 +0200

    Adds unit to capacities in curl example
    
    Change-Id: Ieb307149df7a0f1a4fecf2cbb9c34c4052d05a54

commit a7a79d13a3004c5e9d4a08dea983422b7a7bd8a9
Author: Petr Blaho <pblaho@redhat.com>
Date:   Mon Sep 2 14:14:58 2013 +0200

    Temp. fixes wsme problem with six v1.4.0
    
    Fixes wsme problem with six version 1.4.0.
    Limits six version to <1.4.0 in requirements.txt
    
    This can be lifted after https://review.openstack.org/#/c/44659/
    is merged and new wsme is released.
    
    Change-Id: Iad888ea9a18eb10eacefed0419787153ee35126e

commit e6d2140897d1a76ada823180c45e2ee8093ef74d
Merge: 03ca461 c129fbf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 30 13:44:55 2013 +0000

    Merge "Updates docs to point to stackforge instead of tuskar github repo(s)"

commit 03ca461083235d83e85c1261f0d89ee96c9bf604
Author: marios <marios@redhat.com>
Date:   Tue Aug 27 15:08:43 2013 +0300

    Adds initial database 'migration' tests
    
    As we only have v1 of models/api right now, not possible to do 'proper'
    migration tests. This just adds checks that the database tables are
    created 'correctly' (as defined by v1 migration definitions) @
    tuskar/db/sqlalchemy/migrate_repo/versions/001_init.py.
    Also calls the db_sync to make sure there are no errors there. Uses
    sqlite in memory.
    
    Change-Id: Ib56fc20c0a93839e1913c3a0d04ad772abb6f688

commit c129fbfe2685e8ed0db09d8b0e3629cfde33a4d7
Author: marios <marios@redhat.com>
Date:   Tue Aug 27 16:08:17 2013 +0300

    Updates docs to point to stackforge instead of tuskar github repo(s)
    
    Change-Id: I862df9ee3933e5b41133d2d22b07f608b795063a

commit 03fa57a7c5fc9edde234d88abcc26f6f981c228b
Author: Tomas Sedovic <tsedovic@redhat.com>
Date:   Fri Aug 30 11:49:34 2013 +0200

    Fix the failing py26 tests on jenkins
    
    While all our tests were passing on our dev machines, the python 2.6
    tests were failing in the Stackforge Jenkins environment.
    
    The reason seems to boil down to database queries returning items in a
    different order when no explicit ordering was specified. Our tests were
    relying on one ordering which coused them to fail.
    
    This fixes the two failing tests we had, but there may be more out
    there, passing by a happy coincidence.
    
    Change-Id: I444394a7e73677313ff749525c978f6954fe4509
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

commit c0a723455a9db5897994dfc444b208e7b6856140
Author: Tomas Sedovic <tsedovic@redhat.com>
Date:   Thu Aug 22 17:53:36 2013 +0200

    Fix tests for Python 2.6
    
    Our test cases use the `testtools` package which in turn relies on the
    standard library `unittest` for the basic assert functions.
    
    Unfortunately, Python 2.6's `unittest.TestCase` doesn't come with
    `assertRegexpMatches` which we use in our tests. This caused the py26 Tox
    environment to fail.
    
    Adding `unittest2` (a backport of the 2.7 unittest for earlier versions) and
    mixing it in with our base TestCase class adds the missing asserts.
    
    Change-Id: Ifc69885421f167922b92a37f61dcab3db9665383
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

commit 0d833da823ecfbc0f2480d50a87d03e770baf017
Author: Petr Blaho <pblaho@redhat.com>
Date:   Tue Aug 20 15:53:18 2013 +0200

    Solves pep8 issues according to tox.ini config
    
    Change-Id: I336fe3dc6d268686cd2e45058c434299b42ea1d0

commit 0dc83f952092163c4cd73743c507decbfaf047f2
Author: Matt Wagner <matt.wagner@redhat.com>
Date:   Tue Aug 20 16:30:05 2013 -0400

    Expands test coverage for ResourceClasses
    
    Several of the methods in the ResourceClasses controller were not being
    tested. This covers everything except for some exception-handling cases.
    
    Also fixes unrelated pep8 issues in the test itself.
    
    Change-Id: I85531de7b82eabef0a53592c8044b10546659549

commit c3586b940fdc1c31e38afbc6a68fd6823565d877
Author: marios <marios@redhat.com>
Date:   Mon Aug 19 16:27:50 2013 +0300

    Adds db api tests for Racks
    
    Change-Id: I4849dd9b8b710618e52e06d8254977d56331549a

commit 38e7f32d6ec105ae9f370e70f8d9ac412df525fb
Author: marios <marios@redhat.com>
Date:   Wed Aug 14 16:19:36 2013 +0300

    Initial import of database tests - exercises the db_api, more to come.
    
    Change-Id: I41c6ad35b1491938f253374e22807220fecdfcb4

commit 53bf7c2011de0f84f927fa43122c98774753d862
Author: marios <marios@redhat.com>
Date:   Thu Aug 15 13:02:55 2013 +0300

    Fixes forgotten return statement in api unit tests for resource_class
    Related to bug 1212238 @ https://bugs.launchpad.net/tuskar/+bug/1212238
    
    Change-Id: I87b952b690b688ceb061972784454e6f3e2905ab

commit 440139d68a008ba5cedc530cbbb252f8955fd118
Author: marios <marios@redhat.com>
Date:   Thu Aug 15 13:02:07 2013 +0300

    Make sure we remove old racks from resource_class during update
    
    fixes bug 1212238
    
    https://bugs.launchpad.net/tuskar/+bug/1212238
    
    Change-Id: I4bb51282f1c5cbd9fa0ab5f77825fa95050e3298

commit f44d5158dad7bae570e077273beb2cd8248e8b00
Merge: c6d02b5 7067bc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 15:05:12 2013 +0000

    Merge "Minor bug fix - forgotten declaration of exception.ResourceClassNotFound"

commit 7067bc35e03dbe048c2a6235ee1a7a8261dc694e
Author: marios <marios@redhat.com>
Date:   Wed Aug 14 16:02:08 2013 +0300

    Minor bug fix - forgotten declaration of exception.ResourceClassNotFound
    
    Bug report @ https://bugs.launchpad.net/tuskar/+bug/1212235
    
    Change-Id: Ifaf42d893a917965e5fef418c92b0c149d9945cd

commit c6d02b5f9f03d76599b1ea856987b04d48a370a2
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Mon Aug 12 16:00:54 2013 +0100

    Ignore the same pep8 errors as Nova
    
    fixes bug 1211359
    
    Change-Id: I49dc9f8a302c624d3011c383bbdd62814aa94d44

commit a5b38c1b129234292cc301f27aeb7e375d401027
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Mon Aug 12 16:09:11 2013 +0100

    Add .gitreview file.
    
    fixes bug 1211363
    
    Change-Id: I433b259b9d1193bfea65978a8dbad552863817e3

commit 4975c0ce072ac977929743cbf6503203ea4b0b60
Merge: bc5bfc1 e56f97c
Author: mtaylor <mtaylor@redhat.com>
Date:   Mon Aug 12 06:46:10 2013 -0700

    Merge pull request #107 from petrblaho/pep8-H302-ignore
    
    Adds H302 pep8/hacking error to ignore list

commit e56f97cf3115737cd002cce83f953a5af4c12d51
Author: Petr Blaho <pblaho@redhat.com>
Date:   Mon Aug 12 15:24:02 2013 +0200

    Adds H302 pep8/hacking error to ignore list
    
    Adds H302 import only modules pep8/hacking error to list ignored by
    pep8/flake8 commands - in tox.ini config file.

commit bc5bfc183b36cca18f0828eb34963743d15d9ce7
Merge: 499dcdb e91501d
Author: mtaylor <mtaylor@redhat.com>
Date:   Mon Aug 12 06:06:16 2013 -0700

    Merge pull request #104 from petrblaho/gitignore-coverage-tags
    
    Add trailing * to .coverage to .gitgnore

commit 499dcdb8b1478ea7cdc266d23c4ccadf42394f5b
Merge: c8fe07e 80d8d8d
Author: mtaylor <mtaylor@redhat.com>
Date:   Mon Aug 12 05:33:14 2013 -0700

    Merge pull request #105 from petrblaho/travis-remove-python-version
    
    Removes python version from .travis.yml

commit c8fe07e034158cab3b95efccd38b21868e5126ba
Merge: 902b08c 5d5380f
Author: Petr Blaho <petrblaho@gmail.com>
Date:   Fri Aug 9 08:44:21 2013 -0700

    Merge pull request #101 from mtaylor/refactor_work
    
    Refactor tests and api files

commit 80d8d8d51a5e3c7ecad40299414f15ad988948a6
Author: Petr Blaho <pblaho@redhat.com>
Date:   Fri Aug 9 15:27:12 2013 +0200

    Removes python version from .travis.yml
    
    This remove specification of python version from .travis.yml.
    We do not need it b/c we use travis environments and we use TOX_ENV
    variable in them - and this is the place where we are overriding python
    version from default travis env.

commit e91501d2eee15c9ab0883dfdf3afc73eddd2a86a
Author: Petr Blaho <pblaho@redhat.com>
Date:   Fri Aug 9 15:06:51 2013 +0200

    Adds trailing * to .coverage to .gitgnore
    
    Expands .coverage to .coverage* in .gitignore.

commit 902b08c8316cc1d3d2bbe9bde33e26943348c873
Merge: dfe561c 70b7cf9
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Aug 8 06:07:50 2013 -0700

    Merge pull request #102 from petrblaho/tox-on-travis
    
    Changes travis test command to tox with envs

commit 70b7cf9b4796ffa65acc2f596b697b2d6e2ec199
Author: Petr Blaho <pblaho@redhat.com>
Date:   Wed Aug 7 18:39:56 2013 +0200

    Changes travis test command to tox with envs
    
    This changes travis command for test to tox -e TOX_ENV
    and sets up travis environments to TOX_ENV=py27
    and TOX_ENV=pep8.
    
    This way travis will run both tests on python 2.7
    and will check if code is ok by pep8.
    
    Another benefit is that we now have only one place to define
    tests and pep8 options - tox.ini
    
    It also commands travis to install tox first.

commit 5d5380fe6417496b06a8a4c8e64b11c9ca87e15b
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Aug 7 16:37:56 2013 +0100

    Refactored Tests

commit e3dc83cdf8093e7829bec97556aa49e44662efb5
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Aug 7 15:56:16 2013 +0100

    Refactored API

commit dfe561caafb14e09cefde0272d7b1c9caa411607
Merge: 08d0dcd 0637fe6
Author: Michal Fojtik <mi@mifo.sk>
Date:   Wed Aug 7 05:53:08 2013 -0700

    Merge pull request #99 from marios/flavor_tests
    
    Adds unit tests for flavors CRUD

commit 0637fe6eb8a79615cd60e7b95e112262003b02c3
Author: marios <marios@redhat.com>
Date:   Wed Aug 7 15:15:09 2013 +0300

    Adds unit tests for flavors CRUD

commit 08d0dcd4e191606bda93b15a6e8a0e8ee6f2a61b
Merge: 4d3e993 206e623
Author: marios <marios@redhat.com>
Date:   Tue Aug 6 02:05:08 2013 -0700

    Merge pull request #98 from mfojtik/heat_tests
    
    Added initial datacenters tests

commit 4d3e9937da1be9e0f9d1ab983e138e40b975110d
Merge: e91b2e7 2397394
Author: tzumainn <tzumainn@redhat.com>
Date:   Fri Aug 2 06:40:13 2013 -0700

    Merge pull request #97 from tzumainn/docs
    
    documentation updates

commit 239739414e366e690e0f5140341868308a958446
Author: Tzu-Mainn Chen <tzumainn@redhat.com>
Date:   Fri Aug 2 09:22:23 2013 -0400

    removed Boto doc/references

commit 206e62377d53bca6ffdb76bf5dfd84ccc4dfbb06
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Aug 2 09:11:20 2013 +0200

    Added some mocked data for Heat template tests

commit 39152598b49d7b5cc890ec0b28eb40523808de0e
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 30 12:58:01 2013 +0200

    Added functional test to trigger Heat template generation.

commit 4c6c6c172f2009de336c6a51fe4aa6e214cf83b9
Author: Tzu-Mainn Chen <tzumainn@redhat.com>
Date:   Fri Aug 2 00:05:48 2013 -0400

    minor doc text fixes

commit f98cf95b6cbd21746589f9187e7ce34d707b2a6e
Author: Tzu-Mainn Chen <tzumainn@redhat.com>
Date:   Thu Aug 1 23:56:35 2013 -0400

    doc updates
    
    * created docs version of wiki pages
       * old wiki pages still remain on the wiki
       * 'Home' wiki now provides a link to docs/index.rst
    * updated links to go to docs/ documents
    * changed 'openstack-m' references to 'tuskar'

commit e91b2e75c76fc396f7f2e1647e21e9ae2c139114
Merge: 78203c8 18c43e4
Author: mtaylor <mtaylor@redhat.com>
Date:   Thu Aug 1 07:58:50 2013 -0700

    Merge pull request #96 from tzumainn/docs
    
    created INSTALL.rst, added Contacts, fixed links

commit 18c43e4b11eed1bb7ad8db90cdc95e57ecc21b22
Author: Tzu-Mainn Chen <tzumainn@redhat.com>
Date:   Thu Aug 1 10:42:18 2013 -0400

    created INSTALL.rst, added Contacts, fixed links

commit 78203c8f0b0f910948b911d6dd4c6b16db4630f1
Merge: 7d85c65 8b585e1
Author: marios <marios@redhat.com>
Date:   Thu Aug 1 06:54:04 2013 -0700

    Merge pull request #92 from marios/Issue50
    
    Implements PUT /api/resource_classes/ID to update the Flavors

commit 8b585e1931c7659a728ccff7f2eb5e9dfb059584
Author: marios <marios@redhat.com>
Date:   Thu Aug 1 16:51:50 2013 +0300

    Implements PUT /api/resource_classes/ID to update the Flavors
    
    This will delete all existing flavors and replace them with those in the
    PUT body. Addresses https://github.com/tuskar/tuskar/issues/50

commit 7d85c652ccb5f638200e1a2eb2a97974f077539f
Merge: d006d3d d8ec570
Author: marios <marios@redhat.com>
Date:   Thu Aug 1 05:40:53 2013 -0700

    Merge pull request #95 from jistr/docs
    
    Base documentation organization

commit d8ec57050e7712f4a594cc8a8fe3dad9abdae6b8
Author: Jiri Stransky <jistr@redhat.com>
Date:   Thu Aug 1 13:46:19 2013 +0200

    Call ./docs/ documentation, not website

commit acec3df5e14cd57eea22717c0d35f8c84f317931
Merge: 84f3850 5ec6d3a
Author: Jiri Stransky <jistr@redhat.com>
Date:   Thu Aug 1 13:40:28 2013 +0200

    Merge branch 'overview' into docs
    
    Fixed line length in 'overview'
    
    Conflicts:
    	README.rst

commit 84f3850b3c64c258dcaac118a8307a7b48f8a4a9
Author: Tzu-Mainn Chen <tzumainn@redhat.com>
Date:   Wed Jul 31 16:48:28 2013 -0400

    Base documentation organization
    
    * docs index page
       * links to wiki pages (until wiki pages are moved to docs)
       * TODO placeholders
       * text from updated README
       * link to demo video
    
    (Ammended by jistr for .md -> .rst migration.)

commit 5ec6d3ad400da47b18b1d59f079eb343d925ee51
Author: NoSLZZP <keith.basil@me.com>
Date:   Wed Jul 31 14:44:42 2013 -0400

    Updated Tuskar README
    
    A more descriptive Tuskar Overview based on the recently submitted
    OpenStack Summit abstract.

commit d006d3d5bb95af65a7c2f7a06e517773acd13192
Merge: a235071 c5f95e4
Author: Michal Fojtik <mi@mifo.sk>
Date:   Tue Jul 30 03:47:46 2013 -0700

    Merge pull request #87 from mtaylor/nova-schedule-provision
    
    move nova schedule options to provision.sh

commit c5f95e4c0e8a20f8762abf48bcf27e344dfaa3b0
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Tue Jul 30 10:47:18 2013 +0100

    move nova schedule options to provision.sh

commit a2350710d017dc0fd7ec8a86ee08757d1c3d0597
Merge: 72a73d4 788201c
Author: mtaylor <mtaylor@redhat.com>
Date:   Tue Jul 30 01:05:54 2013 -0700

    Merge pull request #86 from mtaylor/nova-scheduler-conf
    
    Set nova to use host aggregate scheduling in nova.conf

commit 788201c22e29811da27fb30878353218a306a555
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Mon Jul 29 20:18:27 2013 +0100

    Set nova to use host aggregate scheduling in nova.conf

commit 72a73d4ce1b0b1bd950a568371017633caf96283
Merge: 05593b9 a2946fa
Author: mtaylor <mtaylor@redhat.com>
Date:   Mon Jul 29 11:02:42 2013 -0700

    Merge pull request #85 from mtaylor/cfn-hup-work
    
    work around cfn issues with overcloud-control node

commit a2946fa06cda87c0db69dfaeac871dd1e54ce6c1
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Mon Jul 29 16:01:26 2013 +0100

    work around cfn issues with overcloud-control node

commit 05593b94f8383ee883b5f6190049a9cd7c82305e
Merge: 74d6d6d 92f6927
Author: Jiří Stránský <jiri.stransky@gmail.com>
Date:   Mon Jul 29 04:15:44 2013 -0700

    Merge pull request #84 from mfojtik/rack_state_fix
    
    Rack state update fix

commit 92f69271651778a0045b29c1e29d497bde88cf77
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jul 29 13:05:06 2013 +0200

    Do not update Rack state when it is not in 'provisioning'

commit 74d6d6dddc4edf5ad0d9c52bb421ccc5cba1ceb3
Merge: 63f3079 92ea6a5
Author: Michal Fojtik <mi@mifo.sk>
Date:   Mon Jul 29 04:08:23 2013 -0700

    Merge pull request #83 from mtaylor/template_updates
    
    Reworked HEAT template to support meta data

commit 92ea6a556c397fb5285309a4a90891f62bbc901d
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Sun Jul 28 16:20:55 2013 +0100

    Updated Template files

commit 6cff27606edb56d45d69526136d9e159c7601234
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Fri Jul 26 21:30:53 2013 +0100

    Reworked Add Host to Aggregate in template

commit 63f30796b3255d587665177f94662fdb9090aad3
Merge: 40aee8f 3f402ef
Author: marios <marios@redhat.com>
Date:   Fri Jul 26 09:27:23 2013 -0700

    Merge pull request #81 from jistr/bug/rack_update_state_whitelist
    
    Fix state whitelist in rack update

commit 3f402ef43254753ef152ff9fc1fc078f9c7afdf5
Author: Jiri Stransky <jistr@redhat.com>
Date:   Fri Jul 26 18:18:33 2013 +0200

    Fix state whitelist in rack update
    
    Whitelist shouldn't contain 'provisioned', because it's not a valid
    state. It should contain 'active' instead [1].
    
    [1] https://github.com/tuskar/tuskar/blob/40aee8f65bfa4a477149895c92a3f02e23baf1dc/tuskar/db/sqlalchemy/api.py#L289

commit 40aee8f65bfa4a477149895c92a3f02e23baf1dc
Merge: bfa6475 de81616
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jul 26 08:28:00 2013 -0700

    Merge pull request #80 from mtaylor/fix_rack_status_update
    
    Fixed get rack status when no rack exists

commit bfa647500e69c33aa9af713a051824dee15b6309
Merge: 53cf238 5bbc1f8
Author: marios <marios@redhat.com>
Date:   Fri Jul 26 08:27:32 2013 -0700

    Merge pull request #79 from mfojtik/template_wait_for
    
    Added wait_for() to not-compute.yaml template script

commit de816164b4fcb94c54a88565cd03f593f5e5fbc0
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Fri Jul 26 16:24:57 2013 +0100

    Fixed get rack status when it doesn't exist in Heat

commit 5bbc1f893ef3dea56891b26a7d75478ec8e3c2d4
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 26 16:26:08 2013 +0200

    Added wait_for() to not-compute.yaml template script

commit 53cf238fb62852f44336e0dc2db61d542cd5455c
Merge: 480baa0 e068f57
Author: mtaylor <mtaylor@redhat.com>
Date:   Fri Jul 26 05:52:41 2013 -0700

    Merge pull request #78 from marios/move_heat_user_data_to_non_compute
    
    Move HEAT template user data to non_compute from compute

commit e068f57233c9ff360bc4e0e7b9e7e45f46429762
Author: marios <marios@redhat.com>
Date:   Fri Jul 26 15:49:43 2013 +0300

    Move HEAT template user data to non_compute from compute

commit 480baa041c05e1a33ea8d126bd9578fe9293550c
Merge: d39f7e8 c08a7c2
Author: Jiří Stránský <jiri.stransky@gmail.com>
Date:   Fri Jul 26 03:51:57 2013 -0700

    Merge pull request #76 from mfojtik/update_rack_state
    
    Added possiblity to update the Rack state

commit c08a7c2630f72d5dc0197e52abaf6170b985558d
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 26 12:20:57 2013 +0200

    Added possiblity to update the Rack state
    
    NOTE: This patch will not allow to set the Rack state
    when creating a new Rack. The Rack must exists in order to update the state.

commit d39f7e8d00b8a0bcd4a1fdcbbb55628185fea090
Merge: ef8ccaf 2978694
Author: Michal Fojtik <mi@mifo.sk>
Date:   Fri Jul 26 03:03:04 2013 -0700

    Merge pull request #75 from marios/heat_template_flavors_aggregates_etc
    
    Heat template flavors aggregates etc

commit 2978694aff8030c26984e57bc5eb9d482494519c
Author: marios <marios@redhat.com>
Date:   Thu Jul 25 20:06:04 2013 +0300

    Comment out all calls to Nova for managing flavors - this is now handled by the HEAT Template

commit 08f9e5d2e6a624b6cac4c98b6f7155cabcb343ca
Author: marios <marios@redhat.com>
Date:   Fri Jul 26 11:53:51 2013 +0300

    Generate HEAT template complete with definitions for host aggregates and flavors
    
    * create aggregate per resource class, tag with name of resource class
    * place all nodes of all racks in a resource class into it's host aggregate
    * create all flavors, tag with name of resource class
    * explained in https://www.pivotaltracker.com/story/show/53809435

commit ef8ccaf8dcbbd80657fa0f06be1f8f0e0c85e11f
Merge: 173bc1f 163f964
Author: Michal Fojtik <mi@mifo.sk>
Date:   Fri Jul 26 01:17:38 2013 -0700

    Merge pull request #73 from jistr/bug/rack_list_resourceclass_links
    
    Fix resource_class links in Rack listings

commit 163f964ae64f56438c0aa6f4c11138a951df8b80
Author: Jiri Stransky <jistr@redhat.com>
Date:   Thu Jul 25 13:39:28 2013 +0200

    Fix resource_class links in Rack listings
    
    Fixes https://github.com/tuskar/tuskar/issues/55

commit 173bc1f10d00e849b8aa31c6f4c06d1286118e5f
Merge: 2d9af0f 56f75c2
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Jul 25 05:30:23 2013 -0700

    Merge pull request #70 from mfojtik/rack_state
    
    Improved handling of Rack state

commit 56f75c2edd48785717667f80c1634db6796aacc0
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 25 11:54:14 2013 +0200

    Improved handling of Rack state
    
    - Set to 'provisioning' when Heat stack is CREATE_IN_PROGRESS
      or UPDATE_IN_PROGRESS
    
    - Set to 'active' when Heat stack is UPDATE_COMPLETE or CREATE_COMPLETE
    
    - Set to 'error' when Heat stack is UPDATE_FAILED or CREATE_FAILED

commit 2d9af0f6619fba9bffd7c3d9c21f5bbbd4c3c366
Merge: 306a122 d93b6fd
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Jul 25 05:26:57 2013 -0700

    Merge pull request #74 from mfojtik/capacity_unit
    
    Fixed displaying 'unit' attribute for Rack capacities

commit d93b6fde012d3874a45c8a86af2f8a0418d1d5ed
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 25 14:26:16 2013 +0200

    Fixed tests to support 'unit' attribute for Rack capacity

commit 306a1228db9fdd1fa2718044d7106d06918f1ab0
Merge: 6975f4b fd7256a
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Jul 25 05:05:15 2013 -0700

    Merge pull request #67 from mtaylor/create_stack
    
    Create stack

commit d5ec07379670efa2701cb32048e1651b1530a744
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 25 14:01:44 2013 +0200

    Fixed displaying 'unit' attribute for Rack capacities
    
    NOTE: You **need** to re-run the the sample_data.py script.

commit 6975f4b427a772428db51bdc3f6407e752af7079
Merge: ffb3f22 d005ba7
Author: marios <marios@redhat.com>
Date:   Thu Jul 25 04:49:29 2013 -0700

    Merge pull request #71 from mfojtik/templates
    
    Initial change of the 'compute' Heat template to support creating flavors in Nova

commit d005ba7ff3cfecad0e7fd57ee40b2ab2a171a030
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 25 13:05:55 2013 +0200

    Added check to Heat script if instance_type does not already exists

commit 824b449084f365b06ac5f42e79752a1c92893156
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 25 12:49:50 2013 +0200

    Initial change to compute Heat template to create flavors with UserData script

commit 6b94546fbb8274d3af9ce99672c59102550c2d94
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 25 12:30:30 2013 +0200

    Added GET /v1/data_centers/template to return the overcloud HEAT template
    
    This is just for the template debugging.

commit ffb3f2255f06c6d061de1b6fc006de86457805f4
Merge: 7bf3374 e5228d1
Author: Jan Provaznik <jan.provaznik@gmail.com>
Date:   Thu Jul 25 01:36:34 2013 -0700

    Merge pull request #69 from marios/fix_nova_flavor_sync_issues
    
    Protects for cases where flavor already exists or already deleted in nov...

commit e5228d12ca86e61afe3c6936c3d5b0ae39862ee1
Author: marios <marios@redhat.com>
Date:   Thu Jul 25 11:16:47 2013 +0300

    Protects for cases where flavor already exists or already deleted in nova

commit 7bf3374edc7e91f69bee294153e2407db6975870
Merge: 6e1ce95 ddd79be
Author: Michal Fojtik <mi@mifo.sk>
Date:   Wed Jul 24 12:00:00 2013 -0700

    Merge pull request #65 from jguiditta/docs
    
    Add heat sample config to docs.

commit 6e1ce95140391835b6edb11c3950776eaf69a3fb
Merge: b9aef63 01e80b2
Author: Michal Fojtik <mi@mifo.sk>
Date:   Wed Jul 24 11:55:56 2013 -0700

    Merge pull request #66 from mtaylor/heat_creds
    
    Heat creds

commit fd7256a82a18730928925192fe82604f8b106340
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Jul 24 18:44:02 2013 +0100

    create stack if it does not exist

commit 01e80b2b18db537b5622ca003e2f78d2526a38b1
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Jul 24 16:49:34 2013 +0100

    Add username/pass to heat client

commit ddd79be8f38a6e1e37504559bd16ea9cef37ead6
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Wed Jul 24 10:49:14 2013 -0400

    Add heat sample config to docs.

commit b9aef630adaf34f513b9ec66095af045ef8451f2
Merge: 52f8cb2 d5fb1ce
Author: Michal Fojtik <mi@mifo.sk>
Date:   Wed Jul 24 05:40:17 2013 -0700

    Merge pull request #62 from mfojtik/heat_tests
    
    Do not raise exception when Heat credentials are not configured

commit 52f8cb241dd359a6079d099ba7d380efe8098294
Merge: bcb71db f038348
Author: Jiří Stránský <jiri.stransky@gmail.com>
Date:   Wed Jul 24 05:29:31 2013 -0700

    Merge pull request #60 from jistr/bug/pep8_patch_regressions
    
    Blank line fixes related to previous regressions

commit d5fb1ce6e81a3aee945a3dd37409265a9a122a56
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jul 24 14:25:32 2013 +0200

    Do not raise exception when Heat credentials are not configured
    
    This should help tests to pass. The exception is still being logged
    into Tuskar log, but it is not fatal.

commit f0383489096838f83b6defcf601ae8aef90428c9
Author: Jiri Stransky <jistr@redhat.com>
Date:   Wed Jul 24 13:59:11 2013 +0200

    Blank line fixes related to previous regressions
    
    There were 3 wrongly indented return statements introduced in pep8
    pull request [1], then they were fixed again but they were still
    missing the blank lines that caused pblaho's autoindenter to indent
    the return statements wrong. This commit adds those blank lines.
    
    [1] https://github.com/tuskar/tuskar/pull/52

commit bcb71db4a5eff01c3010a208b16b85d762558581
Merge: 2de9685 b389b58
Author: mtaylor <mtaylor@redhat.com>
Date:   Wed Jul 24 05:22:22 2013 -0700

    Merge pull request #56 from mfojtik/heat_conf
    
    Heat API configuration refactoring

commit 2de9685e762858be2337b52577e189d8d8a93a11
Merge: ce2d74d 10105e0
Author: Michal Fojtik <mi@mifo.sk>
Date:   Wed Jul 24 05:21:43 2013 -0700

    Merge pull request #61 from marios/fix_resource_class_flavor_regression
    
    Fix regression with ResourceClass/Flavor from recent rebase hell

commit 10105e069d5f5e8210030a62ce208ee53ab273a0
Author: marios <marios@redhat.com>
Date:   Wed Jul 24 15:19:36 2013 +0300

    Fix regression with ResourceClass/Flavor from recent rebase hell

commit ce2d74da4cf33adc807226623ebaee7d50a93f0a
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jul 24 14:09:30 2013 +0200

    Fixed indentation bug in Racks controller

commit b389b58677e8c4d3c86efa8f0839a7615b824e93
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jul 24 11:22:48 2013 +0200

    Return the Heat stack in JSON on DataCenter#index

commit e043d6e3ddf877e224a0a07a2a288d3c309fe6a7
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jul 24 11:22:05 2013 +0200

    Refactored Heat API configuration
    
    - All settings moved to tuskar.conf

commit 3a6db34d220bc06efe832cc5240939ae7e67fe9e
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jul 24 13:55:51 2013 +0200

    Added python-heatclient back to requirements.txt

commit debac43be3f54f053213195597cf63e2c4ad6962
Merge: 20a9e05 323a299
Author: Michal Fojtik <mi@mifo.sk>
Date:   Wed Jul 24 03:56:53 2013 -0700

    Merge pull request #45 from marios/nova_client
    
    Nova client for Flavor model

commit 323a29967ecf0608babf062d5a2da13a3cb87047
Author: marios <marios@redhat.com>
Date:   Mon Jul 22 16:25:58 2013 +0300

    Updates controllers to use nova flavors client where appropriate (create/delete flavor
    or ResourceClass with flavor). Adds nova_flavor_uuid to Flavor model for tracking
    the nova created flavors

commit 9696e1a80b7919f985af9f3d4d273fa7e8b3cc98
Author: marios <marios@redhat.com>
Date:   Mon Jul 22 16:25:00 2013 +0300

    Nova client for flavors and nova config file (temp - yaml for now)

commit b8a9a7700d0b103d5a54eb820186821dfafea156
Author: marios <marios@redhat.com>
Date:   Mon Jul 22 16:24:22 2013 +0300

    Add python-novaclient and simpleyaml to requirements (for novaclient & config)

commit 20a9e05fcb364bf743ae6177a2718b02eebd14fc
Merge: 9959403 656d9bc
Author: jguiditta <jguiditt@redhat.com>
Date:   Tue Jul 23 13:58:01 2013 -0700

    Merge pull request #22 from jguiditta/fix_test
    
    Status code 500 instead of 404 for deleting non-existent Rack

commit 656d9bc34d6bef6f00c54460e489f23846bf6a75
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Tue Jul 23 16:33:22 2013 -0400

    Fix delete of non-existing rack to return 404.
    
    Addresses issue #22, and fixes test.

commit 9959403f1b74403c5598290961de05dc1f6ffa66
Merge: 9f9b0d5 590800a
Author: jguiditta <jguiditt@redhat.com>
Date:   Tue Jul 23 13:00:44 2013 -0700

    Merge pull request #52 from petrblaho/pep8_errors
    
    Changes format and indents for pep8

commit 9f9b0d5bd6f6015cce2068d80abb24220b41ac51
Merge: 1148f6f 9400d62
Author: Petr Blaho <petrblaho@gmail.com>
Date:   Tue Jul 23 09:28:00 2013 -0700

    Merge pull request #54 from petrblaho/travis_setup
    
    Adds TravisCI config and badge
    Adds irc notification for TravisCI to freenode#tuskar

commit 9400d6288d4c65fe3b5da19aed230550d12c013a
Author: Petr Blaho <petrblaho@gmail.com>
Date:   Tue Jul 23 18:25:04 2013 +0200

    Adds irc notification for TravisCI

commit 590800ad6d9e5704af2fdc9e2c41b8f925fcbd0f
Author: Petr Blaho <petrblaho@gmail.com>
Date:   Tue Jul 23 15:11:43 2013 +0200

    Changes format and indents for pep8
    
    This is changes in code formating and indentation
    to comply with pep8 standard.
    
    It follows current setting in tox.ini for pep8 (flake8).
    
    I skipped errors like:
    * F821 undefined name
    * H302 import only modules

commit 1148f6f7663161b61e52a505294a08bd4598e403
Merge: 831ab98 57972ff
Author: mtaylor <mtaylor@redhat.com>
Date:   Tue Jul 23 08:19:52 2013 -0700

    Merge pull request #53 from mfojtik/update_rack_state
    
    Updating Heat stack and switch from boto to python-heatclient

commit 57972ffa860532e0dc14909bd6afc35541021ba7
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 23 16:42:14 2013 +0200

    Replaced 'boto' with 'python-heatclient'
    
    WARNING:
    
    The OS_AUTH_URL needs to be set in heat/client.py, we should
    move it into configuration soon.

commit 66c2923dc2e491411082963460a2ab6f88f38ec1
Author: Petr Blaho <petrblaho@gmail.com>
Date:   Tue Jul 23 15:51:42 2013 +0200

    Adds TravisCI config and badge
    
    Adds basic .travis.yml with config
    and Travis badge into README.rst

commit acdba0c091abe0b8e46be4f7947d4eb6afb79aa6
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 23 12:53:20 2013 +0200

    Poll for the Heat stack state when accessing Racks
    
    This patch will allow the Rack state to be set to 'provisioning'
    and then instead of setting it to 'provisioned' right after
    the Heat update_stack is called it will check the Heat stack
    state everytime you access the Rack.
    
    Once it found the Rack with state set to 'provisioning' and the Heat
    update is completed, it will change the state to 'provisioned'.

commit 98621e340ced903c7a828c2d425d90b7cd21c3b4
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 23 12:52:34 2013 +0200

    The 'update_rack_state' method now accept the Heat status
    
    The 'rack' state is now set properly based on the Heat stack
    state.

commit f11275c416bbb030f78983e5e63ed253e2ca0431
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 23 12:51:44 2013 +0200

    Added 'get_stack' and 'get_template' to Heat client
    
    - Exceptions are now logged into boto.log

commit 7c40e5b2c2f6e72b5fba78a3668b016ebb60da95
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jul 22 13:59:29 2013 +0200

    Set the Rack state to 'provisioned' when registred to Heat

commit 4268c940a097376eba9a76cfa918d85d851fc55f
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jul 22 13:49:53 2013 +0200

    Added 'update_stack' method to Heat client
    
    This patch also move the 'deploy' operation to DataCenter
    'create' operation, so in order to update the overcloud stack
    you need to: POST /v1/data_centers/
    
    As a result, you should get back the JSON serialization of update
    Heat template.

commit 831ab98b75f9c461d103f053f4b76be99da764ed
Merge: 396c42f 878c368
Author: Michal Fojtik <mi@mifo.sk>
Date:   Tue Jul 23 02:58:17 2013 -0700

    Merge pull request #47 from jistr/ftr/racks_collection_update_fix
    
    Resource class update fix (rack collection)

commit 396c42f11e7b2ff05e69b3b7348d4d3141adb798
Merge: 5d7d267 9802bfe
Author: Michal Fojtik <mi@mifo.sk>
Date:   Tue Jul 23 02:57:52 2013 -0700

    Merge pull request #51 from marios/Issue43_max_vms_Issue34_update_flavor
    
    Fixes issue 34 (update a ResourceClass flavor) and 43 (add max_vms attri...

commit 878c368bbfc398c30488fb698e3fed83170c423e
Author: Jiri Stransky <jistr@redhat.com>
Date:   Mon Jul 22 15:27:27 2013 +0200

    Remove stale fixme comment
    
    The test now passes, so the comment can be removed.

commit 04f32cfa351494bb33c4202175d5fc1211ec3a8b
Author: Jiri Stransky <jistr@redhat.com>
Date:   Mon Jul 22 15:13:32 2013 +0200

    Fix updating racks collection on resource class
    
    There were problems when some racks should be removed from the
    resource class [1]. Now this is fixed and tests for this case are
    added.
    
    [1] https://github.com/tuskar/tuskar/issues/37

commit 9802bfec5bbdc6d833128d56b9943ae8d1273a55
Author: marios <marios@redhat.com>
Date:   Tue Jul 23 11:45:52 2013 +0300

    Fixes issue 34 (update a ResourceClass flavor) and 43 (add max_vms attribute)
    
    https://github.com/tuskar/tuskar/issues/34
    https://github.com/tuskar/tuskar/issues/43

commit 5d7d26745a1c8f126f51a3b8863cfce108cddeea
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Jul 23 09:57:55 2013 +0200

    Fix repo location in README

commit 2f142e6eb1b61688cd78388bd0aa7d8f810db09c
Merge: 9c79042 3c5103d
Author: Michal Fojtik <mi@mifo.sk>
Date:   Mon Jul 22 09:28:01 2013 -0700

    Merge pull request #46 from mtaylor/update_template_generations
    
    Use BareMetal force_nodes in HEAT Template

commit 9c79042abbaebdd31ebc24e02c1dd24bb0d41908
Merge: 2b4b29d 7d47bbb
Author: Michal Fojtik <mi@mifo.sk>
Date:   Mon Jul 22 09:25:27 2013 -0700

    Merge pull request #49 from petrblaho/test_for_rack_update_with_resource_class_id_issue_39
    
    Adds test for updating rack with resource_class_id when resource_class_id is already there.

commit 7d47bbb60d618e33366ecbc5ce23c514ada87db6
Author: Petr Blaho <petrblaho@gmail.com>
Date:   Mon Jul 22 17:36:24 2013 +0200

    Adds test for updating rack with resource_class_id
    
    when resource_class_id is already there.
    See #39 (https://github.com/tuskar/tuskar/issues/39)

commit 3c5103dff5888e68e57f34cac0ec54e72aaa9d9b
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Mon Jul 22 15:17:50 2013 +0100

    Use BareMetal force_nodes in HEAT Template
    
    Uses force-nodes described in the url below to
    provision particular pieces of the HEAT template onto
    particular baremetal machines.
    
    https://review.openstack.org/#/c/27824/

commit 2b4b29d2602b4afa108d0ad8faff46cc9310b644
Merge: 0fcc6e6 1b6f103
Author: Michal Fojtik <mi@mifo.sk>
Date:   Mon Jul 22 05:46:16 2013 -0700

    Merge pull request #41 from jguiditta/sample_data_center
    
    Datacenter description

commit 0fcc6e694882a49f2145b4c851074dcdf693240c
Merge: 45bc371 fd3164a
Author: mtaylor <mtaylor@redhat.com>
Date:   Mon Jul 22 03:34:06 2013 -0700

    Merge pull request #36 from mfojtik/heat
    
    Initial implementation of HEAT CFN client and Template registration

commit 45bc3711a872e2480781038fc894c09426754f4f
Merge: 8877800 0a04cda
Author: Michal Fojtik <mi@mifo.sk>
Date:   Mon Jul 22 01:55:33 2013 -0700

    Merge pull request #42 from jguiditta/docs
    
    Add checklist to CONTRIBUTING.

commit 0a04cda69f7693a1b37d96418c8ef28020ce96d9
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Fri Jul 19 11:08:31 2013 -0400

    Add checklist to CONTRIBUTING.

commit 1b6f103177ee2ab9f0d6403f86a651b1bc90a0ee
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Fri Jul 19 10:52:13 2013 -0400

    Create example datacenter.
    
    This changes the sample_data to describe an example datacenter, allowing for use
    in provisioning via HEAT once that piece of integration is comeplte.

commit 88778004b36a183c6efda8174d0e8b853600d31d
Merge: a8f960f d1b9ffa
Author: Michal Fojtik <mi@mifo.sk>
Date:   Fri Jul 19 07:21:29 2013 -0700

    Merge pull request #40 from mfojtik/rack_rs_id
    
    Ignore updating of ResourceClass when it is already assigned to Rack (#39)

commit d1b9ffa54b49c05c9207a6b9581c5e49fd39ee78
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 19 16:05:45 2013 +0200

    Fix updating the Rack when ResourceClass is already assigned (#39)

commit 7d119d28a8fb6c9345b0d7ec1b15dd0a3e0cfbec
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 19 13:16:52 2013 +0200

    Add ResourceClass to session when updating Racks

commit fd3164acf4643b47558f0070acedd8fef05dc61f
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 19 12:24:06 2013 +0200

    Added 'boto' to list of requirements

commit 1a709105112954c6374d0990a2b83f775f6ed000
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 19 12:18:52 2013 +0200

    Initial implementation of HEAT CFN client and Template registration
    
    This patch adds support for connecting to Heat using:
    
    from tuskar.heat.client import HeatClient as heat_client
    
    heat_client().method
    
    Also update the #index action in DataCenter controller to support
    template validation and registration.

commit a8f960f36dcdbdcc232227c1091b36adfa741f25
Merge: 94999a8 e72ebfc
Author: mtaylor <mtaylor@redhat.com>
Date:   Thu Jul 18 05:24:05 2013 -0700

    Merge pull request #33 from mfojtik/update_rack
    
    Fixed updating of resource_class_id attribute in Rack (#31)

commit 94999a8c3aff8df1d4f34fe1dc6ec2002e40cc24
Merge: 3a2853a ec217c4
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Jul 18 04:07:19 2013 -0700

    Merge pull request #28 from jguiditta/fix_sample_data
    
    Invalid sample data

commit 3a2853a810414c3f160f1c5227ee74a0ea1125da
Merge: 3440a8f 538f2a4
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Jul 18 04:04:58 2013 -0700

    Merge pull request #32 from marios/update_flavors
    
    Adds POST /api/resource_classes/flavors and PUT /api/resource_classes/fl...

commit e72ebfc6066fb11c9d73c009ab019e898dac5595
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 18 12:59:31 2013 +0200

    Fixed updating of resource_class_id attribute in Rack (#31)

commit 538f2a4e7f48b9749df225e070d7848d71707418
Author: marios <marios@redhat.com>
Date:   Thu Jul 18 13:24:39 2013 +0300

    Adds POST /api/resource_classes/flavors and PUT /api/resource_classes/flavors/1
    
    on request from UI (@jprovazn) and tuskar_client (@jistr)

commit ec217c44b170a36c93d4d28e155251d98fdc75f7
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Wed Jul 17 11:15:17 2013 -0400

    Fix sample data for flavors.
    
    This should resolve issue #28.  Flavors are now strictly a sub-resource of
    resource_classes, so change this to add them to our sample resource class.

commit 3440a8f2a55eb5eba1255402592ad3023b6fe3ea
Merge: 5115a56 ef24c5e
Author: jguiditta <jguiditt@redhat.com>
Date:   Wed Jul 17 08:09:16 2013 -0700

    Merge pull request #27 from marios/API_Docs
    
    updates API docs and diagram

commit ef24c5ef18fbd1a9d71ddbeedadcf56bdf70ca9e
Author: marios <marios@redhat.com>
Date:   Wed Jul 17 18:04:58 2013 +0300

    Updates API_Docs

commit 5115a5652936d2e47c2c618523c21c3262c01881
Merge: eb3f28c 81c80b2
Author: mtaylor <mtaylor@redhat.com>
Date:   Wed Jul 17 07:44:33 2013 -0700

    Merge pull request #25 from mfojtik/location
    
    Add 'location' and 'state' attributes for Rack

commit 81c80b293184df1e7452937b8a892e265d41ec84
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 16 14:50:35 2013 +0200

    Added default state 'unprovisioned' to Rack

commit b62370d50074064b7ec7af0fb933645964eb34d0
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Tue Jul 16 14:38:19 2013 +0200

    Added 'location' attribute for Rack

commit eb3f28cc4aaa734ad8b289d0a3650ec9d60b2849
Merge: 58f90a5 f458e72
Author: mtaylor <mtaylor@redhat.com>
Date:   Wed Jul 17 05:46:08 2013 -0700

    Merge pull request #30 from mtaylor/resource_class_on_rack
    
    Allow setting and getting of resource class on Rack

commit f458e724363fa607b93049686239bcfb1611623c
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Jul 17 12:39:07 2013 +0100

    Allow setting ResourceClass on Rack

commit b4662c4969f08e23d1d0acda45182e701fcf251e
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Jul 17 12:10:57 2013 +0100

    Added Relation for Rack Resource Class

commit 58f90a5183e099bb105f020b4cca47f286da26d8
Merge: 16d3fec 26704cd
Author: mtaylor <mtaylor@redhat.com>
Date:   Tue Jul 16 06:37:43 2013 -0700

    Merge pull request #26 from mtaylor/heat
    
    Initial HEAT template generation work

commit 16d3fec0e7d28be04252ad6b779ca6460b4918f5
Merge: 47da749 49f240d
Author: jguiditta <jguiditt@redhat.com>
Date:   Tue Jul 16 06:14:17 2013 -0700

    Merge pull request #24 from slagle/json-renderer
    
    Add a class for custom Json renderer.

commit 26704cd4e6c642d744f50ef9329f56b681a31184
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Tue Jul 16 13:57:46 2013 +0100

    Initial HEAT template generation
    
    Generates a HEAT template based on Tuskar objects.

commit c51095575af852af1bab1a45bcfae2b9cedc16f4
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Tue Jul 16 11:32:34 2013 +0100

    Fixed Templates path in config

commit 49f240d13246f76f929a5821c8b469bd1245f536
Author: James Slagle <jslagle@redhat.com>
Date:   Tue Jul 16 08:45:37 2013 -0400

    Add a class for custom Json renderer.
    
    The custom renderer adds the ability to handle unexpected responses by checking
    the value of the return value from the controller method.  This allows for
    setting different http status codes (such as 404) instead of just the 400 or
    500 that wsme allows.

commit 47da749a267a43e22dcccd48798d3120624d72d5
Author: marios <marios@redhat.com>
Date:   Mon Jul 15 19:10:55 2013 +0300

    Fix Nits: proper URI for Flavor and expose only those Flavors belonging to a ResourceClass

commit c7c8e0845a2f84ca01d70dfa8a47113f5e1429ab
Author: marios <marios@redhat.com>
Date:   Thu Jul 11 23:05:41 2013 +0300

    Expose Flavor resource as a subcollection of ResourceClass - initial commit
    
    examples @
    https://github.com/tuskar/tuskar/wiki/cURL-commands#flavor---this-resource-only-exists-as-part-of-resourceclass

commit 4cfd37595a01374cfe27c746b2ff50b78719b6dc
Author: marios <marios@redhat.com>
Date:   Thu Jul 11 22:52:59 2013 +0300

    initial commit of 'calling out to Nova for Flavor management' code - UNTESTED - will fix in story next sprint. more info in comments @ ./tuskar/compute/nova.py

commit 815d870ab20f5378f0fe3df5719c58c493146736
Merge: c423ea2 08cee68
Author: mtaylor <mtaylor@redhat.com>
Date:   Mon Jul 15 01:47:58 2013 -0700

    Merge pull request #19 from mfojtik/tests
    
    Initial addition of the test for V1 controller

commit c423ea2c4d5a82ba0cae1c7a91ff2b1752d07ad1
Author: jguiditta <jguiditt@redhat.com>
Date:   Fri Jul 12 16:40:34 2013 -0400

    Update CONTRIBUTING.rst
    
    We had not said where to get the openstack-config tool

commit 08cee682cb8b97b1b50145843f65fb6453d749c8
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jul 12 17:04:53 2013 +0200

    Added more tests for V1 Rack

commit 31d0ad0905a51f7643ceb517f497dff5620db0b2
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jul 11 12:29:32 2013 +0200

    Initial import of v1 controller test

commit d00d231b0ce8526f63b467bfb7b41fdd04029d71
Author: marios <marios@redhat.com>
Date:   Tue Jul 9 18:13:37 2013 +0300

    Initial import of API docs from Gist

commit 9db4e33da97721d91b8726eebe90bccb3570f5ab
Merge: c1d4546 2a2e302
Author: mtaylor <mtaylor@redhat.com>
Date:   Thu Jul 4 08:05:34 2013 -0700

    Merge pull request #16 from mtaylor/update_rc
    
    Added update ResourceClass

commit 2a2e3022f6408309f47c65c19113699524628129
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Thu Jul 4 15:49:18 2013 +0100

    Added update ResourceClass

commit c1d45460355d51a8d531ba1b10a7b03a6fc42bde
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Thu Jul 4 13:11:07 2013 +0100

    Fixed git URL in README

commit b3084ade6b10ca5551d31891d501cacaffd40545
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 12:11:09 2013 +0100

    Remove unused APICoverage class
    
    This is used in Nova to ensure that VirtAPI has a test per method in the
    class. We're not using it in Tuskar now, so let's remove it.

commit bee671a5f5b40247e9966fba30545561ca49b425
Merge: 5431ac4 e3d7308
Author: mtaylor <mtaylor@redhat.com>
Date:   Fri Jun 28 03:16:14 2013 -0700

    Merge pull request #15 from markmc/sample-data
    
    Add a script to populate the DB with sample data

commit 5431ac42b34479b91837aa21dde6fe712f70d7f7
Merge: 4905fc4 e3d8ccb
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Fri Jun 28 11:08:23 2013 +0100

    Merge branch 'markmc-fix-rack-update' into HEAD
    
    Conflicts:
    	tuskar/api/controllers/v1.py

commit 4905fc45ef7b952f4caf2b27edb9792beb4b0136
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 10:55:30 2013 +0100

    Fix 62 pep8 errors
    
    We should all run 'tox -e pep8' before pushing.

commit e3d7308a2c051843bd7b1b4c95050ef7249e5f13
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 10:39:52 2013 +0100

    Add a script to populate the DB with sample data
    
    We may not keep this script around forever, but its useful right now.

commit e3d8ccb0a9cdcc8ea62c39f3811ab213d4efa770
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 10:19:43 2013 +0100

    Fix rack update support
    
    Currently, you must do:
    
      curl -X PUT -H 'Accept: application/json' \
                  -H 'Content-Type: application/json' \
           -d '{"id: "1", "name": "new-name"}' http://0.0.0.0:6385/v1/racks
    
    but PUT should be on the entity URL itself:
    
      curl -X PUT -H 'Accept: application/json' \
                  -H 'Content-Type: application/json' \
           -d '{"name": "new-name"}' http://0.0.0.0:6385/v1/racks/1

commit 2cd4ce31147ca5171d47727e05c257a5f2473365
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 08:08:01 2013 +0100

    Pretify json output when poking API with curl

commit 235aa81b8256a9e131ad7278bccdcfe51211812b
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 07:59:53 2013 +0100

    Set --debug in the config file
    
    Rather than passing it on the command line, just set it in the config
    file so that e.g. tuskar-dbsync also prints debug output.

commit 69f807891b2cc26c6861a809d5099f58c87102c1
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 07:58:39 2013 +0100

    Put comments above commands in CONTRIBUTING.rst
    
    I was reading these comments as if they applied to the command below
    them.

commit 48529667f934accca528df9bd668897f69ddd3c0
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 07:57:21 2013 +0100

    Simplify sqlite3 command in CONTRIBUTING.rst
    
    Just pass the '.schema' command as an argument.

commit 38a6ab5d00a1c36253fb1556e638a7ea41568a37
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 07:56:48 2013 +0100

    Use openstack-config in CONTRIBUTING.rst
    
    Makes it easier to edit the config file.
    
    This utility comes from openstack-utils.

commit de10872469b623c37fe5f384e0a5d599f1275937
Merge: cde37b5 91493f6
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 07:35:45 2013 +0100

    Merge remote-tracking branch 'marios/flavors'
    
    Conflicts:
    	tuskar/api/controllers/v1.py
    	tuskar/db/sqlalchemy/api.py
    	tuskar/db/sqlalchemy/models.py

commit cde37b5bc999bea225d3b96a32a3cf80fe769369
Merge: 8a590d0 6dfb040
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Jun 27 23:13:31 2013 -0700

    Merge pull request #8 from mfojtik/rack_update
    
    Initial support for updating the Rack resource

commit 8a590d0fb4c2370ccfd4cc88b00bc276597e8dc0
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 28 07:11:14 2013 +0100

    Tweak the "contributing to tuskar" section

commit 753464d08c1fc7cb1908781b849a4743c40987b8
Merge: 9354147 5a4d22f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Jun 27 23:04:35 2013 -0700

    Merge pull request #11 from jguiditta/docs
    
    Add more developer documentation.

commit 5a4d22fb8ad82193d1a180cca283cc561861978d
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Wed Jun 26 13:43:45 2013 -0400

    Add more developer documentation.

commit 91493f6e4ca81b3512ae6e9d3dba5021f09eab39
Author: marios <marios@redhat.com>
Date:   Thu Jun 27 18:42:39 2013 +0300

    Flavor resource: adds delete and fixes links (self) in serialization

commit 6dfb040b7034babab171c1c067a11ee64a1b9eea
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jun 24 12:59:34 2013 +0200

    Initial support for updating Rack

commit 935414766cb9ec0474509ef891cee33ad3fcf253
Merge: 580d06b 51e595f
Author: mtaylor <mtaylor@redhat.com>
Date:   Thu Jun 27 07:22:27 2013 -0700

    Merge pull request #12 from tomassedovic/entrypoints
    
    Add entry points to the API

commit 51e595f3b50a507830992a329cedc2f42fe085f9
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jun 27 15:38:34 2013 +0200

    Add entry points to the API
    
    GET / and GET /v1/ now return basic metadata. The look and feel is
    in line with the other OpenStack APIs, albeit more spare.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

commit 580d06b56e827afb52eeff7d5b60170321651657
Merge: e022fa5 370b443
Author: mtaylor <mtaylor@redhat.com>
Date:   Thu Jun 27 06:34:36 2013 -0700

    Merge pull request #10 from mtaylor/resource_class_updates
    
    Updated Resource Class API

commit 370b4437f89ebb0f58bc21598d19e5e1cef84e8f
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Wed Jun 26 19:33:33 2013 +0100

    Updated Resource Class API
    
    Add transactions to the database operations
    Add GET and DELETE operations
    Support association of Racks in POST operation
    Starts work on nested marshalling

commit c85c45b09463cbb8fd24841270925aaf153f5f9f
Author: marios <marios@redhat.com>
Date:   Wed Jun 26 18:50:11 2013 +0300

    Flavor resource: adds capacities to serialization and also get_one method

commit b9b103e4572a8df222b2a6c54b3f1a1ae5f4c0f9
Author: marios <marios@redhat.com>
Date:   Tue Jun 25 19:03:08 2013 +0300

    Initial commit/skeleton for Flavor model

commit e022fa570b2eb3185b4700783b1da978955f2323
Merge: d7fdcf7 bac9427
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jun 24 08:36:41 2013 -0700

    Merge pull request #7 from mfojtik/rack_hosts
    
    Added Nodes list for Rack

commit bac94270c315f24ea3d615eada53f7a36552a02a
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jun 24 11:11:10 2013 +0200

    Replaced chassis_url with chassis_id

commit 9467a688f98a918eead657cc443223ca49a721bb
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jun 24 10:48:17 2013 +0200

    Added ironic_url configuration variable

commit 28fd1483159152bc04c5f9bf134ee62f6b116e4a
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Mon Jun 24 10:33:44 2013 +0200

    Replaced 'node_url' with 'node_id'

commit 9bec04afd15c5cb04bc689042e0c770f5d4c8b2e
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jun 21 17:39:05 2013 +0200

    Renamed 'Host' to 'Node'

commit a1d5956f65f476cda6ceba40aad56b659893ba38
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jun 21 17:07:34 2013 +0200

    Added Hosts list for Rack

commit d7fdcf709027e903128bef6bcb73b708550ab621
Merge: fae972c 6db8114
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 21 07:13:54 2013 -0700

    Merge pull request #5 from mfojtik/cleanup
    
    Some basic cleanup

commit 6db811416aa8fa146a589ad18012ccbe5bf9d975
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jun 21 13:16:52 2013 +0200

    Do not store the 'chassis_url' when creating a Rack

commit 72ef94f5bb52c18387064b2a64e43fd0fbecb65a
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jun 21 13:13:41 2013 +0200

    Removed unused as_dict() method from Capacity

commit 1d4b6e22a51aaebd2f88283eccb8fcd9fe925fd4
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Fri Jun 21 12:49:18 2013 +0200

    More refactoring and added delete_rack()

commit e133d5eb87aa688f07acbf558adf14551d655f3e
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jun 20 16:43:04 2013 +0200

    Added Capacity representation to controller

commit bc5dc1d6b8fdbc176f0ebc0a7680867c5c8e37af
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jun 20 15:49:02 2013 +0200

    Added Chassis representation type, some basic refactoring

commit ffa80d55b70abfa51489cac5e30ff17e91c82bd6
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jun 20 15:30:24 2013 +0200

    Removed Blaa and Sausage models/controllers

commit fae972cfeef61756674942e2b0566dd2148e4f58
Merge: 09ac513 f3f9688
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 21 03:43:08 2013 -0700

    Merge pull request #4 from mtaylor/resource_class
    
    Initial resource class work

commit 09ac51363142b9088a3768fd0b7b2e5d54ebbf0c
Merge: f4fc08c cb55e3f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Jun 21 03:39:49 2013 -0700

    Merge pull request #3 from mfojtik/racks_v2
    
    Improvements to Rack JSON serialization

commit f3f96889cc660a9ff2485826285f7e5477946309
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Thu Jun 20 13:16:58 2013 +0100

    resource class db model and methods

commit 3ca364e3f6bb371b9c92a113d269d50e025bc2d4
Author: Martyn Taylor <mtaylor@redhat.com>
Date:   Thu Jun 20 12:37:59 2013 +0100

    Added Resource Class Controller

commit cb55e3f61f51e140f078ece12896b0b20c635a8d
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jun 20 15:26:12 2013 +0200

    Added possibility to retrieve one single Rack

commit 38a36f2d9b1bcb283af776bc2d2962bb854f61f7
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jun 20 10:36:41 2013 +0200

    Improvements to Rack JSON serialization
    
    * Added 'links'
    * Added 'chassis'

commit f4fc08ce4870415320396d3db1deccf576ee2b19
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Thu Jun 20 10:36:53 2013 +0200

    Added more files to .gitignore

commit 195310b7eb7c96fdeb1f553d0c3e627e02af22b4
Merge: c08a996 f02b0ba
Author: Michal Fojtik <mi@mifo.sk>
Date:   Thu Jun 20 01:35:38 2013 -0700

    Merge pull request #2 from mfojtik/racks
    
    WIP: Initial import of the Rack model

commit f02b0ba8064dc335897544a876c36ff50ce1db99
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jun 19 14:37:19 2013 +0200

    Added 'capacities' to the Rack model

commit d6d90748d2f3f7f27adb6ce11f0ff22fdf8c5860
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jun 19 11:29:36 2013 +0200

    Added Rack database model and methods

commit cf1cf3e5d9130611b6b88da38a827cf1684e21bb
Author: Michal Fojtik <mfojtik@redhat.com>
Date:   Wed Jun 19 11:29:02 2013 +0200

    Added initial Rack controller

commit c08a996e0d4ff9e42e528df3a7ccb498ac04e41f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Jun 19 07:13:16 2013 +0100

    Remove the unused plugin framework
    
    This framework is used by Nova to allow adding API extensions and
    notification drivers. Tuskar doesn't use the code at all.

commit 5aaa01f9b2a04f91f1d213194197b938eaa68f6a
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jun 18 16:22:04 2013 +0100

    Add a tool for generating a sample config file

commit 99c0617cafa2aa4f7512c4b09031498f6d770a4d
Merge: 2f9930a c253ed6
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu May 30 11:53:19 2013 -0700

    Merge pull request #1 from jguiditta/readme_fixes
    
    Minor corrections for fedora, up to verion 19.

commit c253ed6c7163488f2e7f42e8c07b6c89c33f659f
Author: Jason Guiditta <jguiditt@redhat.com>
Date:   Thu May 30 14:48:30 2013 -0400

    Minor corrections for fedora, up to verion 19.

commit 2f9930a149df6ca2fd9929c805d5ea4c852596af
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue May 28 14:27:30 2013 +0100

    Rename from Ironic to Tuskar
    
    Change-Id: I4b6c7a70fe8ce1e3ac4cbfc4784b9320399cc8c2

commit 608ed5b5e3f104857ddd552f89833c212e46ea6a
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 20:56:11 2013 +0100

    Add a sample blaas/sausages API
    
    Change-Id: I19d9e156636a825b9c4ebe76af6d2454cc78d1f3

commit 1b7d963ef60a9998101868982308141a35c36876
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue May 28 14:35:46 2013 +0100

    Remove a bunch of unused utils code
    
    Change-Id: I9ea22df60c1ad5f15befca16b8f7732e8383d010

commit 225553eed6a6c5e90236657d23ad40d3180dfb54
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 12:14:45 2013 +0100

    Remove some ironic specific stuff
    
    Change-Id: I55e058dddfc7add074d6c967ec75e20605489b73

commit 76561fa617946276a3f3f20153f810b3aeecdaeb
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 19:45:21 2013 +0100

    Log configuration values on API startup
    
    It's very helpful for every service to log its configuration values on
    startup, so you can e.g. check typos.
    
    Also, change the print statements in the API binary to info logs.
    
    Change-Id: I1b4181ddc7f36149cddb2c24f514d526c403b2e0

commit 33d68467d57d9f3e8153b03eda87d56659a0ca94
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 19:42:57 2013 +0100

    Don't use pecan to configure logging
    
    Fixes bug #1184941
    
    openstack.common.log gives a mechanism to configure logging and, by
    default, we will set up a handler on root logger. Using pecan to also
    configure a handler on the 'ironic' logger means every log message gets
    logged to console twice.
    
    It seems that the pecan logging configuration stuff is redundant with
    our existing logging configuration infrastructure.
    
    Change-Id: Iec0630b0e842e3b6a90021bf552d9b857c5a0552

commit 91f1452c1cefdbebb040d93efcdb9e7cd48cad80
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 10:50:53 2013 +0100

    Remove unused authentication CLI options
    
    These were copied from ceilometer where they are used for things like
    the glance pollster. Ironic doesn't need these.
    
    Change-Id: I93f2a2f3a5a93e9c1ef53514eece7f7ce8c5bffa

commit 5daba2e7872025064f4279c5dca7faa19c59d3e4
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 07:02:17 2013 +0100

    Rename TestCase.flags() to TestCase.config()
    
    The 'flags' thing harks back to when we were using gflags, so rename the
    method to config() like most other projects call it. I really should
    change this in Nova someday too.
    
    Change-Id: I07bcb6392b47cb78a2b58a5a1d663d544e7a5b63

commit 2e0c5d9c4a4173882abdb6ca47b43b07234f7afb
Merge: 2cbbf64 2c39021
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 13:41:19 2013 +0000

    Merge "Copy the RHEL6 eventlet workaround from Oslo"

commit 2cbbf64d90e6f0b671d66cbe647fe31e1018781e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon May 27 11:41:46 2013 +0100

    Move database.backend option import
    
    This opt is only used in db.migration, so move the import from dbsync.
    
    Change-Id: I7ee000f166d78afd08965cf3f035f1274b7de076

commit 2c3902142079974ecf9ba33ee059383c01e25f8e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 13:36:09 2013 +0100

    Copy the RHEL6 eventlet workaround from Oslo
    
    Tests in oslo-incubator now need the horrendous hack to workaround an
    issue with eventlet on RHEL6. We've moved the patch_tox_venv tool
    and redhat-eventlet.patch into oslo-incubator, so add them to
    openstack-common.conf.
    
    Change-Id: I1acfec282b64d7582144b155119bedb1741db2f7

commit 5b0a56da1a3fc6d3c7c4d5a8b9f2a072a4f53205
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 14:12:58 2013 +0100

    Sync new database config group from oslo-incubator
    
    Syncs this change:
    
      4ff33b0 Specify database group instead of DEFAULT
    
    Note: support for legacy configuration is retained.
    
    Change-Id: I42014bb85995b2fd0056ca9b3b55c4fe746168fa

commit 43a7d53f6fc002af0e90c8516bf4195beae42c53
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri May 24 09:59:18 2013 -0700

    Update IPMI driver to work with resource manager.
    
    Update the IPMI driver so that Ironic's resource manager can maintain a
    single instance of it, and pass (task, node) to IPMI methods.  This
    brings the IPMI class in line with the base ControlDriver class
    definition.
    
    Add a missing exception to common/exceptions.py.
    
    IPMI driver methods presently support being called for a single node at
    a time.  Support for multiple nodes passed down by the TaskManager is
    not part of this patch.
    
    Remove terminal support. To be added back later.
    
    Change-Id: Ibb9fc84f7b46d848b0c1ac761a3be952c99f7509

commit 1b2ce541f008b48f37fbcd3c9484400396a030ed
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 21 18:32:35 2013 -0700

    Implement Task and Resource managers.
    
    Implement context and lock management around the manipulation of Nodes
    via TaskManager and ResourceManager classes. Usage guidelines are added
    as docstrings, with a single example in the ManagerService.
    
    Part of bp:ironic-manager
    
    Change-Id: I679ae94ed9ef1c814bc26529cd6360d02292ad40

commit b2c245d753a002c96a07e32bc1183f1f4e72f302
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Thu May 23 11:12:34 2013 -0700

    Update [reserve|release]_nodes to accept a tag.
    
    Update the reserve_nodes and release_nodes DB methods to accept an
    arbitrary "tag", instead of accessing the global CONF.host setting.
    
    Add unit tests to validate behaviour of both single- and multiple-node
    reservations.
    
    Change-Id: Idf5fce13a6aee3dd9c234bf7f18f17d8811383af

commit 989cc2030622e177868c3c74320d4a32309a3b15
Merge: 758d77c 42710ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 24 15:03:13 2013 +0000

    Merge "Sync safe changes from oslo-incubator"

commit 758d77cf7421a890ccc36089bb94a20261178a2d
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Thu May 23 08:42:10 2013 -0700

    More updates to the README.
    
    - Correct driver type names.
    - Add more description about driver loading and implementation.
    
    Change-Id: I145c7a64b9e5def4e103309ee3c9fe45204ae5d6

commit db5aa38a0284f54aa902d7d408b89e696b49f6d6
Merge: 594128d fab112d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 15:07:11 2013 +0000

    Merge "Stop creating a new db IMPL for every request."

commit 594128d10eb2e86f4547d7f3967d5159a144494e
Merge: 0ae207b 284e2bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 15:01:54 2013 +0000

    Merge "Reimplement reserve_nodes and release_nodes."

commit 0ae207b3e1a06a28f6953401814c0f16e0632b10
Merge: 1c67b94 752d77d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 14:59:16 2013 +0000

    Merge "Rename the 'ifaces' table to 'ports'."

commit 1c67b94b4d69d8c739524178bdef5f217e916a66
Merge: e89318e 72f20eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 14:58:54 2013 +0000

    Merge "Change 'nodes' to use more driver-specific JSON."

commit e89318edff400c5621cf7b9c3c169a3b9e28475d
Merge: d14549b c34696b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 14:58:01 2013 +0000

    Merge "Update driver names and base class."

commit d14549b28f5e8d01bc2eba3bbd81362d78d4fb0a
Merge: 8f4a4ea 901ad61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 03:29:14 2013 +0000

    Merge "Sync oslo-incubator python3 changes"

commit 8f4a4ea61085d4c58e00be6df1cc39a6cfcbef11
Merge: 8699b97 526ef52
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 03:25:59 2013 +0000

    Merge "Sync log changes from oslo-incubator"

commit 8699b9746403820013e945c5f84aaa93457e031e
Merge: 4cc7747 c7a7a69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 03:23:32 2013 +0000

    Merge "Sync a rootwrap KillFilter fix from oslo-incubator"

commit 4cc774732f3a65c3ec3025ae16badbc2ed6a76fb
Merge: ab1603b 664e770
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 03:22:37 2013 +0000

    Merge "Sync rpc changes from oslo-incubator"

commit 284e2bdd6f3371533c0737340c543895108b5e39
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 21 20:21:31 2013 -0700

    Reimplement reserve_nodes and release_nodes.
    
    Implement these two methods based on a host, rather than based on
    an instance_uuid.
    
    Also adds some doc strings to db/api.
    
    Part of bp:ironic-manager
    
    Change-Id: I41ddcec90f4dc2b22712cdb069a3d4626fb7c19d

commit 752d77d7b2ceff4e5658190c08ab17ec4d4f64b9
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 21 19:40:24 2013 -0700

    Rename the 'ifaces' table to 'ports'.
    
    Change-Id: I81ffa22954f5ef8977f5fdd0b9bbe8ab1f2083e3

commit 72f20ebe382886bb4c53a8ed5f35792b3d9c879c
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 21 19:24:47 2013 -0700

    Change 'nodes' to use more driver-specific JSON.
    
    Change the 'nodes' table to be more generic, allowing
    drivers to be more flexible in the informatin they track.
    
    Also adds a minimalistic 'chassis' table, and a FK pointing
    from 'nodes' to 'chassis'.
    
    Part of bp:ironic-manager
    
    Change-Id: I0022841f31fdb3aa40883a0403a8427bd9a09a00

commit c34696b477e1b62467c7422aca11ada00e58e69f
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 21 18:32:13 2013 -0700

    Update driver names and base class.
    
    Also, add (task, node) to the base and fake driver method parameters.
    Prepares the way for adding TaskManagers in a following patch.
    
    Change-Id: I846227b2416445a539f9ac51d86b33ea49d4abcb

commit fab112dd65afe9b5e37b7db5fc6dacc088468d8a
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Wed May 22 17:59:14 2013 -0700

    Stop creating a new db IMPL for every request.
    
    IMPL should be created once, at module load, not once for every
    get_instance() call.
    
    Change-Id: Ib2c7888cf9fe074891984e67af83526c994d2e2e

commit ab1603b100861de66439ec981c1f8ce2bf31c18d
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 21 18:25:33 2013 -0700

    Fix double "host" option.
    
    Remove the "host" option from the netconf.py because it's conflicting
    with the "host" option specified in the common/service.py.
    
    Change-Id: Id3cb558626c6f4206143648e313586b1ff9de1e9

commit 42710cebd83e3b58daee109d29a4794d190779ab
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 13:59:49 2013 +0100

    Sync safe changes from oslo-incubator
    
    Sync a bunch of changes from oslo-incubator that are either obviously
    safe, add new code that ironic doesn't use or modifies existing code
    that ironic doesn't use.
    
    The commits are:
    
      fe2f108 Enable hacking H702 localization test
      0a14e1d Enable hacking H703: Multiple positional placeholders
      a4a6789 Pass backdoor_port to services being launched
      d5e57e9 Add DynamicLoopCall timers to ThreadGroups
      926b3e9 Fixes import order nits
      a514693 Removes len() on empty sequence evaluation
      ab6b2d4 Line wrapper becomes to long when expanded.
      b873454 Added convenience APIs for lockutils
      562cc68 Stylistic improvements from quantum-rootwrap
      3893ef8 Import trycmd and ssh_execute from nova.
    
    Change-Id: I0a900b35e4bb4ddd56ecc083a30b0b1fba2e8b04

commit 664e770f7727d63725c3d206006a0ed2048081c5
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 13:54:29 2013 +0100

    Sync rpc changes from oslo-incubator
    
    Syncs:
    
      93ee6e3 Add generic serialization support
      df7ea83 Allow RPC_API_NAMESPACE on RpcProxy objects
      1d7920a Extract matchmaker_ring to own module
      aa89d8b Support capping message versions in the client.
    
    Change-Id: I80a2671997e8074bef9d1ef230ca3956888265e6

commit 526ef52260847661314fd5f2f6ee923a11444870
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 13:48:39 2013 +0100

    Sync log changes from oslo-incubator
    
    This syncs:
    
      b135234 Remove the notifier and its dependencies from log.py
    
    Change-Id: I20699fada068d52c812809237c3d16b653b56bc2

commit c7a7a6954ea8c5ea5c475633fef9a48792852b8f
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 13:52:40 2013 +0100

    Sync a rootwrap KillFilter fix from oslo-incubator
    
    Syncs:
    
      ea78eec Update KillFilter to stop at '\0' for readlink() function.
    
    Change-Id: Id0fa6408b208639e658da337299b390eba5c70f4

commit 901ad6125b1937b61fb849a8c5e148707fd917da
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 13:42:03 2013 +0100

    Sync oslo-incubator python3 changes
    
    Syncs these commits:
    
      0c54b72 python3: use 'as' syntax for exception assignment
      fde1e15 Convert unicode for python3 portability
    
    Note this adds a dependency on the 'six' library.
    
    Change-Id: Ibcffa3ab10f6969f1f088b1f5a890f4aa655e9bf

commit fb4af7c3ebe42cfac6271010e928ccc9fc4d5f81
Author: Chris Krelle <nobodycam@gmail.com>
Date:   Tue May 21 10:53:44 2013 -0700

    Add steps to README.rst
    
    Add tox to pip install.
    Add step to run testr init
    
    Change-Id: I10fd120d7757bc11695d064d488024e545655448
    Authored-by: Chris Krelle <nobodycam@gmail.com>

commit 3ebebe1693df6ed965343ce6dc687cceea27280c
Merge: 371d302 280ce25
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 20 18:54:11 2013 +0000

    Merge "Add some API definitions to the README."

commit 371d302972ce581679ab44b12d0ae306c47c42b5
Merge: 58bfedb 121bb3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 20 17:41:22 2013 +0000

    Merge "Update the README file development section."

commit 121bb3f829295797a788a5ac8b43d39474ec5da9
Author: Lucas Alvares Gomes <lucasagomes@gmail.com>
Date:   Mon May 20 17:51:47 2013 +0100

    Update the README file development section.
    
    Add more prerequisites to set up a local environment for development on
    Ubuntu and the Fedora equivalents.
    
    * libxml2 and libxslt are needed to build lxml.
    * mysql libs are needed to build MySQL-python.
    
    Change-Id: I4627b34ba72d677975c8c067e981fca732d78215

commit 280ce251be106c1f231401b15fa53007fe1f56e1
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 20 08:41:50 2013 -0700

    Add some API definitions to the README.
    
    Change-Id: I549de0d298d030308971c2739bf1ff88ef9363e1

commit 58bfedb7e9e87c7f7416ba3cdbbbfa2298b5071b
Author: Lucas Alvares Gomes <lucasagomes@gmail.com>
Date:   Mon May 20 17:33:55 2013 +0100

    Update the distribute dependency version.
    
    MySQL-python requires the version of distribute to be >=0.6.28.
    
    Change-Id: I44f77481208e1c3d6babd3b7d259f4a450a898c8

commit 42c7d17d3a6cf44dfacee11421fcef671982682e
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri May 17 07:31:52 2013 -0700

    Add information to the project README.
    
    Change-Id: I7f345369ded37167eb01e46e9aeb4e9d9940596e

commit 55502af5d2cefdbc05906f57d9cab9e27bd0f068
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Thu May 16 11:35:55 2013 -0700

    Fix pep8 errors and make it pass Jenkins tests.
    
    Fix all existing pep8 errors.
    Remove install_venv and friends, which were not needed.
    Add a few ignores for nova code that is yet to be cleaned up.
    Skip one failing test case, fixed by review 29394.
    Import contrib/redhat-eventlet.patch from Nova.
    
    Change-Id: I46b6ccaa272bd058757064672ce9221263ed7087

commit accdc459ae3ebce18fc49a8ee48bf0fd97fef85a
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 13 00:51:36 2013 -0700

    Update IPMI driver for new base class.
    
    Fix IPMI unit tests, and add missing power states and exceptions.

commit 3bbaa8c922dafcce17e522d61a4869446e6e2f70
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 13 00:51:21 2013 -0700

    Add new base and fake driver classes.

commit 05b90de34db2fa8e7d5c7c4ecae90ce3790a39ce
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sun May 12 23:36:20 2013 -0700

    Add a few fixes for the API.

commit e8e3b07f1abea59c825c88688935301ac35b3b15
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sun May 12 11:51:48 2013 -0700

    Move strong nova depenencies into temporary dir.
    
    Sequester files which have a very strong dependency on the nova codebase
    into a separate "nova" dir. These will be ported and/or re-implemented
    in Ironic. Move the corresponding unit tests to "tests/nova".
    
    Also, disable the unit tests by removing __init__.py from that dir.

commit b75b4a89167860fc4e5c5b9a13521bc884effb4d
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sat May 11 18:17:22 2013 -0700

    Add unit tests for DB API.
    
    Also, fix some issues found along the way.

commit 4d34906eba347f56a13b193efa3cedb3f2ab2a24
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sat May 11 16:25:57 2013 -0700

    Add tests for ironic-dbsync.

commit 905ef4bf4e236ddb3717f0f089d2fbec9adff4b9
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sat May 11 15:42:03 2013 -0700

    Implement GET /node/ifaces/<id> in API.

commit 9bbbb4b29324279e76768a560e7fd3e6c57d6bba
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sat May 11 09:36:27 2013 -0700

    Update exception.py
    
    - rename NovaException -> IronicException
    - remove many unused exceptions

commit 0bd40b7c829a65ed3c0fb1486a645f62c2db7a2e
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sat May 11 07:09:40 2013 -0700

    Update db models and API.

commit aee8142fb4790db7f0bc32ad1b7ae1882aee467f
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri May 10 11:48:08 2013 -0700

    Implement skeleton for a new DB backend.

commit 6102857bd9ad349332a2e2ddece228f56b9f875b
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri May 10 23:41:56 2013 -0700

    Remove the old db implementation.

commit f14822571d345a395179ce45d1edcdcb76bbe1f2
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Thu May 9 17:43:34 2013 -0700

    Implement initial skeleton of a manager service.

commit bae17291e0f8f81b1b0985e1da842fa826f92570
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 6 20:07:49 2013 -0700

    Implement initial draft of a Pecan-based API.

commit 568e8b844df1f768081e23de5c4951241fb1d2ab
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 6 10:34:53 2013 -0700

    Fix IPMI tests.

commit 76ca433b4b47f8b4bb7becb62b7d93ebe3a342b6
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 6 11:44:52 2013 -0700

    Merge and trim utils and test_utils.
    
    Merge baremetal/utils and nova utils
    Merge baremetal/test_utils and nova/test_utils
    Remove many unused methods from both files
    Update test_pxe for merged utils.py

commit f642482de5f469291e153931da748201c7269e63
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Mon May 6 10:17:32 2013 -0700

    Move common things to ironic.common.
    
    Move from ironic/ to ironic/common/
     config.py
     context.py
     exception.py
     paths.py
     policy.py
     safe_utils.py
     states.py
     utils.py

commit 9a29aa6ff2a00fc5166f9aa3648dec6626aeac7c
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sun May 5 06:52:32 2013 -0700

    Fix failing db and deploy_helper tests
    
    - minor cleanup of db/sqlalchemy/api
    - fix some things in conf_fixtures
    - fix tests in deploy_helper
    - remote unused retry_on_deadlock method
    - remove network and service from test.py

commit 6e730cd76e88eae44118cf2d7ebdc6c0b0c0cec4
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Sun May 5 06:52:08 2013 -0700

    un-split the db backend

commit 6cbb3b5ccc4982ec3afad6b3c1a554d61f2f5e22
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri May 3 14:01:05 2013 -0700

    Rename files and fix things.

commit 1f276b1a4ab3a3dc51eb4dcbb730f357f64054d3
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 7 16:36:49 2013 -0700

    Import add'l files from Nova
    
    Import lots of files from Nova at rev
    f0da3464ab17552f24977d22365fa9573702f5a8

commit a1a0ea64da9547f4c097a444dd74124f5337ad98
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Tue May 7 16:23:48 2013 -0700

    update openstack-common.conf and import from oslo

commit dda738635be75ce9a5204a70700680ed217fd95f
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 2 17:32:04 2013 -0400

    Added .testr.conf.

commit 7d0233e406ef5946d6bee300d577414c0dae6af2
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 2 15:55:48 2013 -0400

    Renamed nova to ironic.

commit c595a0e2dcc2d5486f2bd70f4f8f198280d97fb8
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 2 15:49:06 2013 -0400

    Fixed hacking, pep8 and pyflakes errors.

commit d65ac059846dd8ec41a15863dc1bdd2bb3a4289d
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 2 14:50:57 2013 -0400

    Added project infrastructure needs.

commit 07d272b2aad660682dc59f1ff038adeb10481210
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu May 27 23:05:26 2010 -0700

    initial commit