Merge branch 'master' of git://github.com/opscode/cookbooks
Merge branch 'master' of git://github.com/opscode/cookbooks
Initial commit
Merge branch 'master' into qa
Squashed commit of the following:

commit 1f41cabab20bc6fe75ce20fb107ae3c51eb873b8
Merge: 579ca35 d393033
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:14:09 2011 -0500

    Merge branch 'user-definition' of github.com:CraigCottingham/users into user-definition

commit 579ca35ef281ebd70a8e1ed9829ccfcc7c2a85e7
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:13:10 2011 -0500

    Comment out setting adduser_cmd per platform, as we're not using that command at all

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit c5813504817fdfd66547245ff356c4e335f95847
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:12:37 2011 -0500

    Only create ~/.ssh if ssh_keys are specified for the user

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 568d60a72d79ed1da29ad0c26e7738ddeb0bdc02
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:12:03 2011 -0500

    Squashed commit of the following:

    commit e8a191626eec6d7aa32c689f7bf9f171f78e0cde
    Merge: 6003c96 97cbc87
    Author: Craig S. Cottingham <craig.cottingham@gmail.com>
    Date:   Wed Jul 13 15:56:22 2011 -0500

        Merge branch 'qa' of https://github.com/cookbooks/users into qa

    commit 97cbc87177fa8a5f86f34c89316e4583b346a19e
    Merge: 0a3dede ac4b085
    Author: cookbooks <hedge.hogs.hiatus@gmail.com>
    Date:   Mon Feb 7 23:52:13 2011 +1100

        Merge branch 'master' into qa

    commit 0a3dede36825df33fda12b5125341936772d3936
    Author: Hedgehog <hedgehogshiatus@gmail.com>
    Date:   Mon Feb 7 23:52:02 2011 +1100

        Initial commit

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 6bda68d639ba33ba3f671452a4aef108e3948b95
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 15:54:01 2011 -0500

    Move the bulk of the user creation code to a definition, so it can be more easily reused in other recipes

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit d39303367f88ce6215c96d6749b49ed343c248dc
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:13:10 2011 -0500

    Comment out setting adduser_cmd per platform, as we're not using that command at all

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit c4ab93caff6f24030e0683e59670f1a467c0426f
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:12:37 2011 -0500

    Only create ~/.ssh if ssh_keys are specified for the user

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 7c6f9ba6ac05714474fd20291f89f8e51ade09e1
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 17:12:03 2011 -0500

    Squashed commit of the following:

    commit e8a191626eec6d7aa32c689f7bf9f171f78e0cde
    Merge: 6003c96 97cbc87
    Author: Craig S. Cottingham <craig.cottingham@gmail.com>
    Date:   Wed Jul 13 15:56:22 2011 -0500

        Merge branch 'qa' of https://github.com/cookbooks/users into qa

    commit 97cbc87177fa8a5f86f34c89316e4583b346a19e
    Merge: 0a3dede ac4b085
    Author: cookbooks <hedge.hogs.hiatus@gmail.com>
    Date:   Mon Feb 7 23:52:13 2011 +1100

        Merge branch 'master' into qa

    commit 0a3dede36825df33fda12b5125341936772d3936
    Author: Hedgehog <hedgehogshiatus@gmail.com>
    Date:   Mon Feb 7 23:52:02 2011 +1100

        Initial commit

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit e8a191626eec6d7aa32c689f7bf9f171f78e0cde
Merge: 6003c96 97cbc87
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 15:56:22 2011 -0500

    Merge branch 'qa' of https://github.com/cookbooks/users into qa

commit 47e65a0deae3688cbee1e4bb2dccf21696dca9cd
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Wed Jul 13 15:54:01 2011 -0500

    Move the bulk of the user creation code to a definition, so it can be more easily reused in other recipes

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 6003c96f4558ea6d247bc7f44f46db04067fa10f
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Sat Jun 18 14:02:38 2011 -0500

    Fix syntax error in metadata.rb

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 88b9877bfb914b5188e057ca5ef86d69c0b2ddba
Merge: 5257369 e051d12
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Sat Jun 18 12:25:01 2011 -0500

    Merge branch 'default' into live-CraigCottingham

commit 5257369522cb7321b6bdfe6853848f31ce85a29a
Merge: 7e00ac0 ccae142
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Sat Jun 18 12:23:54 2011 -0500

    Merge branch 'master' into qa

commit ccae142912653f10e2585d19ac731b6d698802b6
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Sat Jun 18 12:23:42 2011 -0500

    Ignore Tower icon

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit e051d128e11c647f0ea3b51c44040e3367f9b8e7
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Mon Apr 11 12:02:39 2011 -0500

    Add .gitignore for Tower icon

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit eb00dbe7dc2b048c0d95fbbba7f9dc1e7531a4a2
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Sun Apr 10 23:34:42 2011 -0500

    Add support for SSH authorized keys to default recipe

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 917afcbc2341db1075ee6ccd793f58dd4690761e
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Sun Apr 10 17:47:11 2011 -0500

    Add default recipe

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 72c828007120214db1dc1c69acec541398f2b1a6
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Fri Apr 8 11:55:53 2011 -0500

    Add attributes for default recipe

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit e099fe47248aac460029972a3fe9fd43db527dc4
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Fri Apr 8 11:55:40 2011 -0500

    Add default recipe to metadata

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 12cdf63a0fc3b6cb78a96c65a005871e26aca2f7
Author: Craig S. Cottingham <craig.cottingham@gmail.com>
Date:   Fri Apr 8 11:55:26 2011 -0500

    Add default recipe

    Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>

commit 7e00ac0ef644ceafff1dfc97ef25b1504bf95a68
Merge: 082cd65 a98f325
Author: cookbooks <hedge.hogs.hiatus@gmail.com>
Date:   Mon Feb 7 23:52:13 2011 +1100

    Merge branch 'master' into qa

commit 082cd65ee4d8a96b825ac1e6ee689a85c55fae1a
Author: Hedgehog <hedgehogshiatus@gmail.com>
Date:   Mon Feb 7 23:52:02 2011 +1100

    Initial commit

commit a98f32553d3d2b825de881e93ae094a690268342
Merge: 7fa2757 8d4fd96
Author: Hedgehog <hedgehogshiatus@gmail.com>
Date:   Mon Dec 13 13:18:00 2010 +1100

    Merge branch 'master' of git://github.com/opscode/cookbooks

commit 8d4fd96488880b9cf03a567f7e0377154a5146bf
Author: jtimberman <joshua@opscode.com>
Date:   Thu Dec 9 10:23:23 2010 -0700

    COOK-422, update metadata maintainer for opscode

commit 7fa275722faacef52607416e0f6357d83b556dff
Author: Hedgehog <hedgehogshiatus@gmail.com>
Date:   Mon Dec 6 15:47:22 2010 +1100

    Merge branch 'master' of git://github.com/opscode/cookbooks

commit 20a094ed327f910ba95884d291f48c6689053a20
Author: jtimberman <joshua@opscode.com>
Date:   Mon Oct 25 00:21:24 2010 -0600

    bump versions in metadata for releases

commit 442d8509139ac803dacf820380ec79fafdbf769a
Author: jtimberman <joshua@opscode.com>
Date:   Sun Oct 24 21:48:01 2010 -0600

    update readme w/ corrected knife commands and some other clarification

commit dc3cd542605d4484599076ca0d3a88d656767718
Author: James Le Cuirot <chewi@aura-online.co.uk>
Date:   Wed Oct 6 14:02:19 2010 +0100

    users cookbook: Don't break if not using Apache.

commit f3b9f8226eca1800ff9f96a92706d2d8857ff376
Author: James Le Cuirot <chewi@aura-online.co.uk>
Date:   Wed Oct 6 14:03:23 2010 +0100

    users cookbook: Allow user gid to be specified.

commit 8dbde5470295660589e3973e5465f0ab7d9e362f
Author: jtimberman <joshua@opscode.com>
Date:   Tue Jul 27 12:08:48 2010 -0600

    Add users cookbook

Signed-off-by: Craig S. Cottingham <craig.cottingham@gmail.com>
Merge pull request #2 from CraigCottingham/cookbooks-qa

Whew. Finally managed to get everything into a single commit.
Fix typo in recipe name.
Merge pull request #4 from mheffner/patch-2

Fix typo in recipe name
From the README, this should be using the databag. After this change it appears to work for me using the documented data bag method.
Don't use search on data bags as that support does not exist in chef-solo.
Merge branch 'master' into patch-3

Conflicts:
	README.md
	metadata.json
	metadata.rb