You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/08/10 19:23:33 UTC
hbase git commit: HBASE-14081 Remove (outdated) references to
SVN/trunk from documentation
Repository: hbase
Updated Branches:
refs/heads/master ce72ce998 -> ae35f65e9
HBASE-14081 Remove (outdated) references to SVN/trunk from documentation
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ae35f65e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ae35f65e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ae35f65e
Branch: refs/heads/master
Commit: ae35f65e9ac12256b4514e6ba6ef5333e9e90870
Parents: ce72ce9
Author: Gábor Lipták <gl...@gmail.com>
Authored: Fri Aug 7 14:58:32 2015 -0400
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Mon Aug 10 10:23:09 2015 -0700
----------------------------------------------------------------------
src/main/asciidoc/_chapters/community.adoc | 10 +++++-----
src/main/asciidoc/_chapters/developer.adoc | 6 +++---
src/main/asciidoc/_chapters/performance.adoc | 2 +-
src/main/asciidoc/_chapters/rpc.adoc | 3 ++-
src/main/site/resources/doap_Hbase.rdf | 14 +++++++-------
5 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ae35f65e/src/main/asciidoc/_chapters/community.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/community.adoc b/src/main/asciidoc/_chapters/community.adoc
index 4b91b0d..573fb49 100644
--- a/src/main/asciidoc/_chapters/community.adoc
+++ b/src/main/asciidoc/_chapters/community.adoc
@@ -62,11 +62,11 @@ Any -1 on a patch by anyone vetos a patch; it cannot be committed until the just
.How to set fix version in JIRA on issue resolve
Here is how link:http://search-hadoop.com/m/azemIi5RCJ1[we agreed] to set versions in JIRA when we resolve an issue.
-If trunk is going to be 0.98.0 then:
+If master is going to be 0.98.0 then:
-* Commit only to trunk: Mark with 0.98
-* Commit to 0.95 and trunk : Mark with 0.98, and 0.95.x
-* Commit to 0.94.x and 0.95, and trunk: Mark with 0.98, 0.95.x, and 0.94.x
+* Commit only to master: Mark with 0.98
+* Commit to 0.95 and master: Mark with 0.98, and 0.95.x
+* Commit to 0.94.x and 0.95, and master: Mark with 0.98, 0.95.x, and 0.94.x
* Commit to 89-fb: Mark with 89-fb.
* Commit site fixes: no version
@@ -103,7 +103,7 @@ Owners do not need to be committers.
[[hbase.commit.msg.format]]
== Commit Message format
-We link:http://search-hadoop.com/m/Gwxwl10cFHa1[agreed] to the following SVN commit message format:
+We link:http://search-hadoop.com/m/Gwxwl10cFHa1[agreed] to the following Git commit message format:
[source]
----
HBASE-xxxxx <title>. (<contributor>)
http://git-wip-us.apache.org/repos/asf/hbase/blob/ae35f65e/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index 5184767..409efbd 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -570,7 +570,7 @@ Checkin the _CHANGES.txt_ and any version changes.
. Update the documentation.
+
Update the documentation under _src/main/asciidoc_.
-This usually involves copying the latest from trunk and making version-particular adjustments to suit this release candidate version.
+This usually involves copying the latest from master and making version-particular adjustments to suit this release candidate version.
. Build the source tarball.
+
@@ -1935,7 +1935,7 @@ If the contributor used +git format-patch+ to generate the patch, their commit m
[[committer.amending.author]]
====== Add Amending-Author when a conflict cherrypick backporting
-We've established the practice of committing to trunk and then cherry picking back to branches whenever possible.
+We've established the practice of committing to master and then cherry picking back to branches whenever possible.
When there is a minor conflict we can fix it up and just proceed with the commit.
The resulting commit retains the original author.
When the amending author is different from the original committer, add notice of this at the end of the commit message as: `Amending-Author: Author
@@ -1956,7 +1956,7 @@ A committer should.
In the thread link:http://search-hadoop.com/m/DHED4EiwOz[HBase, mail # dev - ANNOUNCEMENT: Git Migration In Progress (WAS =>
Re: Git Migration)], it was agreed on the following patch flow
-. Develop and commit the patch against trunk/master first.
+. Develop and commit the patch against master first.
. Try to cherry-pick the patch when backporting if possible.
. If this does not work, manually commit the patch to the branch.
http://git-wip-us.apache.org/repos/asf/hbase/blob/ae35f65e/src/main/asciidoc/_chapters/performance.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/performance.adoc b/src/main/asciidoc/_chapters/performance.adoc
index 2155d52..f213175 100644
--- a/src/main/asciidoc/_chapters/performance.adoc
+++ b/src/main/asciidoc/_chapters/performance.adoc
@@ -546,7 +546,7 @@ To disable the WAL, see <<wal.disable>>.
=== HBase Client: Group Puts by RegionServer
In addition to using the writeBuffer, grouping `Put`s by RegionServer can reduce the number of client RPC calls per writeBuffer flush.
-There is a utility `HTableUtil` currently on TRUNK that does this, but you can either copy that or implement your own version for those still on 0.90.x or earlier.
+There is a utility `HTableUtil` currently on MASTER that does this, but you can either copy that or implement your own version for those still on 0.90.x or earlier.
[[perf.hbase.write.mr.reducer]]
=== MapReduce: Skip The Reducer
http://git-wip-us.apache.org/repos/asf/hbase/blob/ae35f65e/src/main/asciidoc/_chapters/rpc.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/rpc.adoc b/src/main/asciidoc/_chapters/rpc.adoc
index 43e7156..c319f39 100644
--- a/src/main/asciidoc/_chapters/rpc.adoc
+++ b/src/main/asciidoc/_chapters/rpc.adoc
@@ -71,7 +71,8 @@ Optionally, Cells(KeyValues) can be passed outside of protobufs in follow-behind
-For more detail on the protobufs involved, see the link:http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto?view=markup[RPC.proto] file in trunk.
+For more detail on the protobufs involved, see the
+link:https://git-wip-us.apache.org/repos/asf?p=hbase.git;a=blob;f=hbase-protocol/src/main/protobuf/RPC.proto;hb=HEAD[RPC.proto] file in master.
==== Connection Setup
http://git-wip-us.apache.org/repos/asf/hbase/blob/ae35f65e/src/main/site/resources/doap_Hbase.rdf
----------------------------------------------------------------------
diff --git a/src/main/site/resources/doap_Hbase.rdf b/src/main/site/resources/doap_Hbase.rdf
index 08e9bc0..46082a1 100644
--- a/src/main/site/resources/doap_Hbase.rdf
+++ b/src/main/site/resources/doap_Hbase.rdf
@@ -36,16 +36,16 @@
<category rdf:resource="http://projects.apache.org/category/database" />
<release>
<Version>
- <name>Apache hbase 0.92.1</name>
- <created>2012-03-19</created>
- <revision>0.92.1</revision>
+ <name>Apache hbase </name>
+ <created>2015-07-23</created>
+ <revision>2.0.0-SNAPSHOT</revision>
</Version>
</release>
<repository>
- <SVNRepository>
- <location rdf:resource="http://svn.apache.org/repos/asf/hbase"/>
- <browse rdf:resource="http://svn.apache.org/viewvc/hbase"/>
- </SVNRepository>
+ <GitRepository>
+ <location rdf:resource="git://git.apache.org/hbase.git"/>
+ <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=hbase.git"/>
+ </GitRepository>
</repository>
<maintainer>
<foaf:Person>