Shawn Pearce 79b7aa185e Merge branch 'stable-2.10' ...

* stable-2.10:
  Fix IncludingGroupMembership.containsAnyOf infinite loop
  Fix using HTTP methods other than GET from plugins
  Pass ChangeControl into CodeReviewCommit error instances
  Avoid CodeReviewCommit.error() whenever possible
  Update replication plugin to latest revision

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java

Change-Id: I9c59567bd54a493a5e262e7776df00f1b776b553

2014-10-16 21:52:13 -07:00

..

access

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

account

Merge branch 'stable-2.10'

2014-10-16 21:52:13 -07:00

api

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

args4j

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

auth

Consistently use com.google.inject.Inject instead of javax.inject.Inject

2014-10-07 10:11:09 +02:00

avatar

Miscellaneous Javadoc cleanups to cut down on Eclipse warnings

2013-10-09 12:18:31 -07:00

cache

Add REST endpoint to list caches

2014-05-28 09:29:12 +02:00

change

Provide a useful body when revision parsing is ambiguous

2014-10-15 21:03:34 +00:00

changedetail

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

config

Cleanup test of ScheduleConfig

2014-10-01 10:42:55 -07:00

contact

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

data

Move ChangeKind to PatchSetAttribute

2014-05-29 15:42:08 -05:00

documentation

Allow to provide custom CSS to MarkdownFormatter

2014-10-15 12:56:57 +02:00

edit

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

events

Introduce ref operation validation

2014-10-01 13:32:53 +00:00

extensions

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

git

Merge branch 'stable-2.10'

2014-10-16 21:52:13 -07:00

group

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

index

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

ioutil

…

mail

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

notedb

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

patch

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

plugins

Fix compilaion error

2014-10-16 23:24:11 +02:00

project

Removing redundant class WeblinksProvider

2014-10-01 14:07:07 +02:00

query

CodeReviewCommit: Add a static method to create a RevWalk

2014-10-07 09:08:04 +00:00

schema

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

securestore

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

ssh

Fix Daemon start when sshd.listenAddress=off and host key doesn't exist

2013-11-29 17:21:43 +01:00

tools

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

util

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

validators

Allow plugins to perform validation of hashtag changes.

2014-09-14 16:42:34 +09:00

AccessPath.java

Revert "Remove unused WEB_BROWSER access path"

2013-11-29 21:00:56 +00:00

AnonymousUser.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

ApprovalCopier.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

ApprovalsUtil.java

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

ChangeMessagesUtil.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

ChangeUtil.java

Move TimeUtil from gerrit-server to gerrit-common

2014-10-06 07:53:44 -07:00

CmdLineParserModule.java

Organize ALL the imports

2014-08-20 10:23:06 +09:00

CommonConverters.java

Fix JavaDoc warning

2014-08-19 22:36:27 +00:00

CurrentUser.java

Replace pattern "user instanceof IdentifiedUser" with method call

2013-09-05 04:50:44 +00:00

DefaultFileExtensionRegistry.java

Use properties file to map file extensions to CM3 mime types

2014-07-16 03:27:50 +00:00

FileTypeRegistry.java

…

GerritPersonIdent.java

…

GerritPersonIdentProvider.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

IdentifiedUser.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

InternalUser.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

MimeUtilFileTypeRegistry.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

OptionUtil.java

…

OutputFormat.java

…

PatchLineCommentsUtil.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

PeerDaemonUser.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

PluginUser.java

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

2014-09-30 10:53:50 +02:00

ProjectUtil.java

Replace <code> with {@code} in javadoc

2013-11-24 13:12:20 -08:00

RemotePeer.java

…

RequestCleanup.java

Apply "type inference for generic instance creation" Java 7 feature

2014-04-26 15:27:57 +02:00

StringUtil.java

Make constant private static final

2013-11-08 00:31:51 +04:00

UrlEncoded.java

…

WebLinks.java

Removing redundant class WeblinksProvider

2014-10-01 14:07:07 +02:00