accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1292829 - in /incubator/accumulo/site/trunk: content/accumulo/ templates/
Date Thu, 23 Feb 2012 15:46:40 GMT
Author: billie
Date: Thu Feb 23 15:46:38 2012
New Revision: 1292829

URL: http://svn.apache.org/viewvc?rev=1292829&view=rev
Log:
added merging and other practices to dev guide

Modified:
    incubator/accumulo/site/trunk/content/accumulo/index.mdtext
    incubator/accumulo/site/trunk/content/accumulo/mailing_list.mdtext
    incubator/accumulo/site/trunk/content/accumulo/notable_features.mdtext
    incubator/accumulo/site/trunk/content/accumulo/papers.mdtext
    incubator/accumulo/site/trunk/content/accumulo/screenshots.mdtext
    incubator/accumulo/site/trunk/content/accumulo/source.mdtext
    incubator/accumulo/site/trunk/templates/sidenav.mdtext

Modified: incubator/accumulo/site/trunk/content/accumulo/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/index.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/index.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/index.mdtext Thu Feb 23 15:46:38 2012
@@ -16,7 +16,7 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-Accumulo is a sorted, distributed key/value store based on Google's
+Apache Accumulo is a sorted, distributed key/value store based on Google's
 [BigTable][1] design.  It is built on top of Apache [Hadoop][2],
 [Zookeeper][3], and [Thrift][4].  It features a few novel improvements on the
 BigTable design in the form of cell-level access labels and a server-side

Modified: incubator/accumulo/site/trunk/content/accumulo/mailing_list.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/mailing_list.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/mailing_list.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/mailing_list.mdtext Thu Feb 23 15:46:38
2012
@@ -1,4 +1,4 @@
-Title: Mailing Lists
+Title: Apache Accumulo Mailing Lists
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: incubator/accumulo/site/trunk/content/accumulo/notable_features.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/notable_features.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/notable_features.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/notable_features.mdtext Thu Feb 23 15:46:38
2012
@@ -1,4 +1,4 @@
-Title: Notable Features
+Title: Apache Accumulo Notable Features
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: incubator/accumulo/site/trunk/content/accumulo/papers.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/papers.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/papers.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/papers.mdtext Thu Feb 23 15:46:38 2012
@@ -1,4 +1,4 @@
-Title: Papers
+Title: Apache Accumulo Related Papers
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: incubator/accumulo/site/trunk/content/accumulo/screenshots.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/screenshots.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/screenshots.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/screenshots.mdtext Thu Feb 23 15:46:38
2012
@@ -1,4 +1,4 @@
-Title: Screenshots
+Title: Apache Accumulo Screenshots
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: incubator/accumulo/site/trunk/content/accumulo/source.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/source.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/source.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/source.mdtext Thu Feb 23 15:46:38 2012
@@ -1,4 +1,4 @@
-Title: Accumulo Source Code & Developers Guide
+Title: Apache Accumulo Source Code & Developers Guide
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -46,7 +46,27 @@ Accumulo uses [Jenkins][jenkins] for aut
 
 ### Issue Tracking
 
-Accumulo [tracks issues][jiraloc] with [JIRA][jira].
+Accumulo [tracks issues][jiraloc] with [JIRA][jira].  Every commit should reference a JIRA
ticket of the form ACCUMULO-#.
+
+### Merging Practices
+
+Changes should be merged from earlier branches of Accumulo to later branches.  Currently,
all changes are being merged from the 1.4 branch and later, but not all changes are merged
from the 1.3 branch.  When you make a change in branch 1.x, use the following process to merge
to subsequent versions 1.y and 1.z:
+
+    svn merge -r 1:HEAD 1.x_svn_url 1.y_local_dir
+
+    examine merged files and conflicts
+
+    svn ci 1.y_local_dir
+
+    make sure the commit includes the svn mergeinfo
+
+    svn merge -r 1:HEAD 1.y_svn_url 1.z_local_dir
+
+    examine merged files and conflicts
+
+    svn ci 1.z_local_dir
+
+    make sure the commit includes the svn mergeinfo
 
 ### Coding Practices
 
@@ -65,7 +85,10 @@ Accumulo [tracks issues][jiraloc] with [
 
 ### SVN
 
-* Instructions for configuring svn client are [here](http://www.apache.org/dev/version-control.html#https-svn-config).
+ Instructions for configuring svn clients are [here](http://www.apache.org/dev/version-control.html#https-svn-config).
+
+### Release Guide
+Accumulo's release guide can be found [here][release].
 
 [subversion]: http://subversion.apache.org/
 [maven]: http://maven.apache.org/
@@ -79,8 +102,4 @@ Accumulo [tracks issues][jiraloc] with [
 [13build]: https://builds.apache.org/job/Accumulo-1.3.x/
 [jiraloc]: https://issues.apache.org/jira/browse/accumulo
 [jira]: http://www.atlassian.com/software/jira/overview
-
-### Release Guide
-Accumulo's release guide can be found [here][1]
-
-  [1]: /accumulo/governance/releasing.html
\ No newline at end of file
+[release]: /accumulo/governance/releasing.html

Modified: incubator/accumulo/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/templates/sidenav.mdtext?rev=1292829&r1=1292828&r2=1292829&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/templates/sidenav.mdtext (original)
+++ incubator/accumulo/site/trunk/templates/sidenav.mdtext Thu Feb 23 15:46:38 2012
@@ -11,7 +11,7 @@
  - [People](https://issues.apache.org/jira/secure/ConfigureReport.jspa?versionId=-2&selectedProjectId=12312121&reportKey=com.sourcelabs.jira.plugin.report.contributions%3Acontributionreport)
 
 # Development
- - [Source Code](/accumulo/source.html)
+ - [Source & Guide](/accumulo/source.html)
  - [Issues](https://issues.apache.org/jira/browse/accumulo)
  - [Builds](https://builds.apache.org/view/A-F/view/Accumulo/)
 



Mime
View raw message