diff options
| author | Shawn O. Pearce <sop@google.com> | 2010-08-12 16:42:02 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2010-08-12 16:42:02 -0700 |
| commit | 78a63ddfea66014cea68a4f7541a0770e358cf68 (patch) | |
| tree | 39dc954c22a4b2657552a1d41462f4919b777c66 /gerrit-war/pom.xml | |
| parent | dfd895e35147953d362b29b78123f8558e57d684 (diff) | |
| parent | f855f399f8ce740e08ddc48c0694c1c076fa69dd (diff) | |
| download | gerrit-exp-nosql.tar.gz | |
Merge branch 'master' into exp-nosqlexp-nosql
* master:
Fix all of our pom.xml versions to be 2.1-SNAPSHOT
Use internal templates to simplify minor formatting commands.
Convert 3 email classes to file based templates.
Convert the Abandoned and MergeFail email classes to templates
Use a template to set the contents of the CommentEmails.
Use a template to set the footer on ChangeEmails.
Use a template to set the contents of the MergedEmails.
Use a template to set the subject line.
Add framework for using velocity templates in email classes
Add ability to deactivate a user when they leave the project.
Conflicts:
gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java
gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
Change-Id: Iac92b56e10f9cc4063fc0ec3cea6c79a5a087994
Diffstat (limited to 'gerrit-war/pom.xml')
| -rw-r--r-- | gerrit-war/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index 4bfa17e2..87cfaa5f 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <parent> <groupId>com.google.gerrit</groupId> <artifactId>gerrit-parent</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>gerrit-war</artifactId> |