allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wwitz...@apache.org
Subject [1/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Date Wed, 12 Dec 2012 14:47:58 GMT
Updated Branches:
  refs/heads/master 03b9fae93 -> 4c7b8153e


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4c7b8153
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4c7b8153
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4c7b8153

Branch: refs/heads/master
Commit: 4c7b8153eaa4fc233325f9b436466e0766c8197c
Parents: e902375 03b9fae
Author: Wayne Witzel III <wwitzel@geek.net>
Authored: Wed Dec 12 14:46:22 2012 +0000
Committer: Wayne Witzel III <wwitzel@geek.net>
Committed: Wed Dec 12 14:46:22 2012 +0000

----------------------------------------------------------------------
 Allura/allura/command/taskd.py                     |    7 +-
 Allura/allura/command/taskd_cleanup.py             |  179 +++++++++++++++
 Allura/allura/controllers/discuss.py               |    2 +
 Allura/allura/lib/app_globals.py                   |   18 ++
 Allura/allura/lib/spam/__init__.py                 |    4 +
 Allura/allura/lib/spam/akismetservice.py           |   26 ++
 Allura/allura/model/artifact.py                    |   12 +-
 Allura/allura/model/auth.py                        |    6 +-
 Allura/allura/model/discuss.py                     |    6 +-
 Allura/allura/model/notification.py                |    3 +-
 Allura/allura/templates/mail/Discussion.txt        |    3 +
 Allura/allura/tests/functional/test_feeds.py       |    2 +-
 Allura/allura/tests/model/test_discussion.py       |    2 +-
 Allura/allura/tests/test_commands.py               |  115 +++++++++-
 Allura/allura/tests/test_globals.py                |    1 +
 Allura/allura/tests/unit/test_spam.py              |   80 +++++++
 Allura/development.ini                             |   15 +-
 Allura/setup.py                                    |    1 +
 ForgeBlog/forgeblog/tests/functional/test_root.py  |    4 +
 .../forgediscussion/controllers/root.py            |    1 +
 .../forgediscussion/tests/functional/test_forum.py |   15 +-
 .../forgetracker/tests/functional/test_root.py     |   19 ++
 .../forgetracker/tests/unit/test_ticket_model.py   |    2 +-
 .../forgewiki/command/wiki2markdown/__init__.py    |   22 ++-
 requirements-sf.txt                                |    1 +
 25 files changed, 523 insertions(+), 23 deletions(-)
----------------------------------------------------------------------



Mime
View raw message