diff options
| author | Shawn Pearce <sop@google.com> | 2013-04-18 21:37:48 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-04-18 21:37:48 -0700 |
| commit | a91af729c6a88851c29586ef5845a78ae4681b61 (patch) | |
| tree | ef01b1f69fce7962573eb3f0440e82b1579f8397 /Documentation | |
| parent | 9fdaa99090bf4ceb2ccb7d81c2ca9615fa973de6 (diff) | |
| parent | 401c9380b35a84e93f3ba4794c5f7259e16a1041 (diff) | |
Merge branch 'stable-2.6'
* stable-2.6:
Update PostgreSQL createuser example
Remove deprecated methods from FormatUtil
Remove unused import
Remove unused getAuthType method from InitHttpd
Conflicts:
gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
Change-Id: I1285d734283e643430fd731ff4a219271377f182
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/database-setup.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/database-setup.txt b/Documentation/database-setup.txt index 0465d62b0c..c559b0ed90 100644 --- a/Documentation/database-setup.txt +++ b/Documentation/database-setup.txt @@ -33,7 +33,7 @@ password, create a database to store the metadata, and grant the user full rights on the newly created database: ---- - $ createuser --username=postgres -S -R -D -P -E gerrit2 + $ createuser --username=postgres -RDIElPS gerrit2 $ createdb --username=postgres -E UTF-8 -O gerrit2 reviewdb ---- |