Merge branch '1.8' of opensuse/build-service into 1.8
authorMartin Mohring <martinmohring@linuxfoundation.org>
Thu, 27 May 2010 20:35:17 +0000 (22:35 +0200)
committerMartin Mohring <martinmohring@linuxfoundation.org>
Thu, 27 May 2010 20:35:17 +0000 (22:35 +0200)
commite2bb4c8ebd26e33d80a38afcac5f8888f9fb701a
treed1e25624fdc2f3c7823313574461bab117a37870
parent0ba31585954fafca681ade38f65edd22e1ea8c8c
parent8c8a27f0e00c8337e25184e04f68ddb515c4e5f9
Merge branch '1.8' of opensuse/build-service into 1.8

* '1.8' of opensuse/build-service:
  merged from master:
  as with master, readaccess flag has been renamed to sourceaccess
  fixed: it seems negated logic flags do not work. privacy is now also an enabled flag
  merged from AccessControl branch: bulk patch for AccessControl

Conflicts:
docs/api/api/package.xsd
docs/api/api/project.xsd
src/api/app/controllers/build_controller.rb
src/api/app/controllers/source_controller.rb
src/api/app/models/db_package.rb
src/api/app/models/db_project.rb
src/api/app/models/package.rb
src/api/app/models/privacy_flag.rb
src/api/app/models/user.rb
src/api/db/migrate/20100328100000_add_new_permissions_and_role.rb
src/backend/BSXML.pm
dist/obs-server.spec
src/backend/BSXML.pm