svn commit: r1492672 - /accumulo/site/branches/git/content/git.mdtext

2013-06-13 Thread elserj
Author: elserj Date: Thu Jun 13 13:51:09 2013 New Revision: 1492672 URL: http://svn.apache.org/r1492672 Log: ACCUMULO-1498 Fixing spelling error. Modified: accumulo/site/branches/git/content/git.mdtext Modified: accumulo/site/branches/git/content/git.mdtext URL:

svn commit: r865562 - /websites/staging/accumulo/trunk/content/

2013-06-13 Thread buildbot
Author: buildbot Date: Thu Jun 13 13:51:20 2013 New Revision: 865562 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) Propchange: websites/staging/accumulo/trunk/content/

svn commit: r1492786 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/conf/ core/src/test/java/org/apache/accumulo/core/conf/ server/src/main/java/org/apache/accumulo/server/ server/s

2013-06-13 Thread ctubbsii
Author: ctubbsii Date: Thu Jun 13 17:53:28 2013 New Revision: 1492786 URL: http://svn.apache.org/r1492786 Log: ACCUMULO-1313 Annotate configuration properties and behave accordingly as Interpolated(interpolate), Deprecated(strikethrough in docs), Sensitive(mask value or hide), and

svn commit: r1492884 - in /accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core: Constants.java client/ZooKeeperInstance.java

2013-06-13 Thread vines
Author: vines Date: Thu Jun 13 22:08:55 2013 New Revision: 1492884 URL: http://svn.apache.org/r1492884 Log: Not happy with that start Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java

svn commit: r1492911 - in /accumulo/trunk: conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/nativ

2013-06-13 Thread ctubbsii
Author: ctubbsii Date: Fri Jun 14 00:11:55 2013 New Revision: 1492911 URL: http://svn.apache.org/r1492911 Log: ACCUMULO-1396 simplify specifying target directories from the maven workspace, for developers; updated example files Modified:

svn commit: r1492946 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-06-13 Thread ctubbsii
Author: ctubbsii Date: Fri Jun 14 03:32:16 2013 New Revision: 1492946 URL: http://svn.apache.org/r1492946 Log: ACCUMULO-1488 fix merge conflicts from 1.5 branch to trunk caused by the addition of the same files to two branches of the tree, without merging history Modified: accumulo/trunk/

svn commit: r1492947 - /accumulo/branches/1.5/core/

2013-06-13 Thread ctubbsii
Author: ctubbsii Date: Fri Jun 14 03:59:04 2013 New Revision: 1492947 URL: http://svn.apache.org/r1492947 Log: ACCUMULO-1498 ensure 1.4 merges cleanly to 1.5 Modified: accumulo/branches/1.5/core/ (props changed) Propchange: accumulo/branches/1.5/core/

svn commit: r1492948 - in /accumulo/branches/1.5: ./ assemble/ core/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java pro

2013-06-13 Thread ctubbsii
Author: ctubbsii Date: Fri Jun 14 04:02:25 2013 New Revision: 1492948 URL: http://svn.apache.org/r1492948 Log: ACCUMULO-1498 Fix more svn mergeinfo from 1.4 to 1.5 Modified: accumulo/branches/1.5/ (props changed) accumulo/branches/1.5/assemble/ (props changed)

svn commit: r1492949 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-06-13 Thread ctubbsii
Author: ctubbsii Date: Fri Jun 14 04:20:55 2013 New Revision: 1492949 URL: http://svn.apache.org/r1492949 Log: ACCUMULO-1498 Ensure 1.5 branch merges cleanly to trunk Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props