You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/27 21:25:47 UTC
git commit: Merge branch 'db/6255' into db/6255-6277
Updated Branches:
refs/heads/db/6255-6277 [created] a1d6b5f92
Merge branch 'db/6255' into db/6255-6277
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a1d6b5f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a1d6b5f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a1d6b5f9
Branch: refs/heads/db/6255-6277
Commit: a1d6b5f9239a22bc07ef4802d60577ab1be2cb2f
Parents: 1b9cdc2 cef728f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon May 27 15:25:24 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon May 27 15:25:24 2013 -0400
----------------------------------------------------------------------
Allura/allura/model/filesystem.py | 12 ++++++------
Allura/allura/tests/functional/test_admin.py | 11 ++++++-----
.../allura/tests/functional/test_neighborhood.py | 6 +++---
Allura/setup.py | 1 -
.../tests/functional/test_forum_admin.py | 4 ++--
.../forgetracker/tests/functional/test_root.py | 9 +++++----
ForgeWiki/forgewiki/tests/functional/test_root.py | 10 +++++-----
README.markdown | 4 +---
requirements-common.txt | 2 +-
scripts/rethumb.py | 5 ++---
vagrant/manifests/ubuntu-1204-server-amd64.pp | 12 ------------
11 files changed, 31 insertions(+), 45 deletions(-)
----------------------------------------------------------------------